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

[cascardo/linux.git] / fs / gfs2 / inode.c

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 7efd1d1..f6c4f00 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -2040,10 +2040,7 @@ const struct inode_operations gfs2_file_iops = {
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,

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

        .listxattr = gfs2_listxattr,
        .listxattr = gfs2_listxattr,

-       .removexattr = generic_removexattr,

        .fiemap = gfs2_fiemap,
        .get_acl = gfs2_get_acl,
        .set_acl = gfs2_set_acl,
        .fiemap = gfs2_fiemap,
        .get_acl = gfs2_get_acl,
        .set_acl = gfs2_set_acl,


@@ -2062,10 +2059,7 @@ const struct inode_operations gfs2_dir_iops = {
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,

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

        .listxattr = gfs2_listxattr,
        .listxattr = gfs2_listxattr,

-       .removexattr = generic_removexattr,

        .fiemap = gfs2_fiemap,
        .get_acl = gfs2_get_acl,
        .set_acl = gfs2_set_acl,
        .fiemap = gfs2_fiemap,
        .get_acl = gfs2_get_acl,
        .set_acl = gfs2_set_acl,


@@ -2078,10 +2072,7 @@ const struct inode_operations gfs2_symlink_iops = {
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,

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

        .listxattr = gfs2_listxattr,
        .listxattr = gfs2_listxattr,

-       .removexattr = generic_removexattr,

        .fiemap = gfs2_fiemap,
 };
 
        .fiemap = gfs2_fiemap,
 };