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

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

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 7d66b20..814e405 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -432,10 +432,7 @@ const struct inode_operations ext2_dir_inode_operations = {
        .mknod          = ext2_mknod,
        .rename         = ext2_rename,
 #ifdef CONFIG_EXT2_FS_XATTR
-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,
        .listxattr      = ext2_listxattr,
-       .removexattr    = generic_removexattr,
 #endif
        .setattr        = ext2_setattr,
        .get_acl        = ext2_get_acl,
@@ -445,10 +442,7 @@ const struct inode_operations ext2_dir_inode_operations = {
 
 const struct inode_operations ext2_special_inode_operations = {
 #ifdef CONFIG_EXT2_FS_XATTR
-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,
        .listxattr      = ext2_listxattr,
-       .removexattr    = generic_removexattr,
 #endif
        .setattr        = ext2_setattr,
        .get_acl        = ext2_get_acl,