diff -ur linux-2.4.0-test11-pre6/fs/ntfs/fs.c linux/fs/ntfs/fs.c
--- linux-2.4.0-test11-pre6/fs/ntfs/fs.c Fri Nov 17 11:05:11 2000
+++ linux/fs/ntfs/fs.c Fri Nov 17 11:08:02 2000
@@ -428,7 +428,7 @@
int error=0;
ntfs_attribute *si;
- r=new_inode(dir->i_sb);
+ r=ntfs_new_inode(dir->i_sb);
if(!r){
error=ENOMEM;
goto fail;
@@ -500,7 +500,7 @@
goto out;
error = EIO;
- r = new_inode(dir->i_sb);
+ r = ntfs_new_inode(dir->i_sb);
if (!r)
goto out;
diff -ur linux-2.4.0-test11-pre6/fs/ntfs/inode.c linux/fs/ntfs/inode.c
--- linux-2.4.0-test11-pre6/fs/ntfs/inode.c Wed Jun 21 18:10:02 2000
+++ linux/fs/ntfs/inode.c Fri Nov 17 11:08:32 2000
@@ -1050,7 +1050,7 @@
/* We have to skip the 16 metafiles and the 8 reserved entries */
static int
-new_inode (ntfs_volume* vol,int* result)
+ntfs_new_inode (ntfs_volume* vol,int* result)
{
int byte,error;
int bit;
@@ -1236,11 +1236,11 @@
ntfs_volume* vol=dir->vol;
int byte,bit;
- error=new_inode (vol,&(result->i_number));
+ error=ntfs_new_inode (vol,&(result->i_number));
if(error==ENOSPC){
error=ntfs_extend_mft(vol);
if(error)return error;
- error=new_inode(vol,&(result->i_number));
+ error=ntfs_new_inode(vol,&(result->i_number));
}
if(error){
ntfs_error ("ntfs_get_empty_inode: no free inodes\n");