Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-bionic-kernel.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 4bbcae1ba58ef99a99e0510f00556526c9b48621..a7f601cd521a079af70d0364a67478ab3e9d5831 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;