fs: make remaining filesystems use .rename2

[mirror_ubuntu-bionic-kernel.git] / fs / kernfs / dir.c

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index e57174d436830a4111a1bfdf7c9b7fa11a124908..c7e23ca945abf916afc0cd81610e12f05f173406 100644 (file)
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -1096,13 +1096,17 @@ static int kernfs_iop_rmdir(struct inode *dir, struct dentry *dentry)
 }
 
 static int kernfs_iop_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 kernfs_node *kn  = old_dentry->d_fsdata;
        struct kernfs_node *new_parent = new_dir->i_private;
        struct kernfs_syscall_ops *scops = kernfs_root(kn)->syscall_ops;
        int ret;
 
+       if (flags)
+               return -EINVAL;
+
        if (!scops || !scops->rename)
                return -EPERM;
 
@@ -1133,7 +1137,7 @@ const struct inode_operations kernfs_dir_iops = {
 
        .mkdir          = kernfs_iop_mkdir,
        .rmdir          = kernfs_iop_rmdir,
-       .rename         = kernfs_iop_rename,
+       .rename2        = kernfs_iop_rename,
 };
 
 static struct kernfs_node *kernfs_leftmost_descendant(struct kernfs_node *pos)