Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / kernfs / dir.c

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index a6e430a..dcd96aa 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;
 
@@ -1126,9 +1130,6 @@ const struct inode_operations kernfs_dir_iops = {
        .permission     = kernfs_iop_permission,
        .setattr        = kernfs_iop_setattr,
        .getattr        = kernfs_iop_getattr,
-       .setxattr       = generic_setxattr,
-       .removexattr    = generic_removexattr,
-       .getxattr       = generic_getxattr,
        .listxattr      = kernfs_iop_listxattr,
 
        .mkdir          = kernfs_iop_mkdir,