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

[cascardo/linux.git] / drivers / staging / lustre / lustre / llite / namei.c

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index dfa36d3..ff3ce74 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -1152,10 +1152,7 @@ const struct inode_operations ll_dir_inode_operations = {
        .setattr            = ll_setattr,
        .getattr            = ll_getattr,
        .permission      = ll_inode_permission,
-       .setxattr          = generic_setxattr,
-       .getxattr          = generic_getxattr,
        .listxattr        = ll_listxattr,
-       .removexattr    = generic_removexattr,
        .get_acl            = ll_get_acl,
 };
 
@@ -1163,9 +1160,6 @@ const struct inode_operations ll_special_inode_operations = {
        .setattr        = ll_setattr,
        .getattr        = ll_getattr,
        .permission     = ll_inode_permission,
-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,
        .listxattr      = ll_listxattr,
-       .removexattr    = generic_removexattr,
        .get_acl            = ll_get_acl,
 };