Merge remote-tracking branch 'ovl/rename2' into for-linus

[cascardo/linux.git] / fs / fat / namei_vfat.c

diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index d4a1b2b..bf46a2d 100644 (file)
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -903,7 +903,8 @@ out:
 }
 
 static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
 }
 
 static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,

-                      struct inode *new_dir, struct dentry *new_dentry)
+                      struct inode *new_dir, struct dentry *new_dentry,
+                      unsigned int flags)

 {
        struct buffer_head *dotdot_bh;
        struct msdos_dir_entry *dotdot_de;
 {
        struct buffer_head *dotdot_bh;
        struct msdos_dir_entry *dotdot_de;


@@ -914,6 +915,9 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
        int err, is_dir, update_dotdot, corrupt = 0;
        struct super_block *sb = old_dir->i_sb;
 
        int err, is_dir, update_dotdot, corrupt = 0;
        struct super_block *sb = old_dir->i_sb;
 

+       if (flags & ~RENAME_NOREPLACE)
+               return -EINVAL;
+

        old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
        old_inode = d_inode(old_dentry);
        new_inode = d_inode(new_dentry);
        old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
        old_inode = d_inode(old_dentry);
        new_inode = d_inode(new_dentry);