Merge remote-tracking branch 'keys/keys-next'

[deliverable/linux.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index adb04146df09281ff5825382c0f73564024061b9..cf3fc8db909c60d35d9b6c46d87ad2850bb31b94 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -4369,12 +4369,9 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        if (error)
                return error;
 
-       if (!old_dir->i_op->rename && !old_dir->i_op->rename2)
+       if (!old_dir->i_op->rename)
                return -EPERM;
 
-       if (flags && !old_dir->i_op->rename2)
-               return -EINVAL;
-
        /*
         * If we are going to change the parent - check write permissions,
         * we'll need to flip '..'.
@@ -4428,14 +4425,8 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                if (error)
                        goto out;
        }
-       if (!old_dir->i_op->rename2) {
-               error = old_dir->i_op->rename(old_dir, old_dentry,
-                                             new_dir, new_dentry);
-       } else {
-               WARN_ON(old_dir->i_op->rename != NULL);
-               error = old_dir->i_op->rename2(old_dir, old_dentry,
-                                              new_dir, new_dentry, flags);
-       }
+       error = old_dir->i_op->rename(old_dir, old_dentry,
+                                      new_dir, new_dentry, flags);
        if (error)
                goto out;