diff options
Diffstat (limited to 'fs/umsdos/namei.c')
| -rw-r--r-- | fs/umsdos/namei.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/umsdos/namei.c b/fs/umsdos/namei.c index 42820bb98..51cfb0809 100644 --- a/fs/umsdos/namei.c +++ b/fs/umsdos/namei.c @@ -5,10 +5,7 @@ * Inspired from linux/fs/msdos/... by Werner Almesberger * * Maintain and access the --linux alternate directory file. -*/ -#ifdef MODULE -#include <linux/module.h> -#endif + */ #include <linux/errno.h> #include <linux/kernel.h> @@ -126,7 +123,6 @@ void umsdos_startlookup (struct inode *dir) while (umsdos_waitcreate (dir) != 0); dir->u.umsdos_i.u.dir_info.looking++; } -void check_page_tables(void); /* Unlock the directory. @@ -357,7 +353,8 @@ chkstk(); ret = msdos_rename (old_dir ,old_info.fake.fname,old_info.fake.len ,new_dir - ,new_info.fake.fname,new_info.fake.len); + ,new_info.fake.fname,new_info.fake.len + ,0); chkstk(); PRINTK (("after m_rename ret %d ",ret)); if (ret != 0){ @@ -437,7 +434,7 @@ static int umsdos_symlink_x( in unused entry of the EMD file. The other is to have a separate file dedicated to hold all symbolic links data. - Lets go for simplicity... + Let's go for simplicity... */ struct inode *inode; int ret; @@ -450,7 +447,7 @@ static int umsdos_symlink_x( struct file filp; filp.f_pos = 0; /* Make the inode acceptable to MSDOS */ - ret = umsdos_file_write_kmem (inode,&filp,(char*)symname,len); + ret = umsdos_file_write_kmem (inode,&filp,symname,len); iput (inode); if (ret >= 0){ if (ret != len){ @@ -1018,7 +1015,8 @@ int UMSDOS_rename( int old_len, struct inode * new_dir, const char * new_name, - int new_len) + int new_len, + int must_be_dir) { /* #Specification: weakness / rename There is a case where UMSDOS rename has a different behavior |