Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / orangefs / namei.c

diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 0e34fcf..4d5576a 100644 (file)
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -462,9 +462,6 @@ const struct inode_operations orangefs_dir_inode_operations = {
        .rename = orangefs_rename,
        .setattr = orangefs_setattr,
        .getattr = orangefs_getattr,
        .rename = orangefs_rename,
        .setattr = orangefs_setattr,
        .getattr = orangefs_getattr,

-       .setxattr = generic_setxattr,
-       .getxattr = generic_getxattr,
-       .removexattr = generic_removexattr,

        .listxattr = orangefs_listxattr,
        .permission = orangefs_permission,
 };
        .listxattr = orangefs_listxattr,
        .permission = orangefs_permission,
 };