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

[linux-2.6-block.git] / fs / kernfs / dir.c

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 390390212b4324855331862d0110515bc5c618e5..dcd96aac02f5c401451479dfec78d7db87c45bae 100644 (file)
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -1130,9 +1130,6 @@ const struct inode_operations kernfs_dir_iops = {
        .permission     = kernfs_iop_permission,
        .setattr        = kernfs_iop_setattr,
        .getattr        = kernfs_iop_getattr,
-       .setxattr       = kernfs_iop_setxattr,
-       .removexattr    = kernfs_iop_removexattr,
-       .getxattr       = kernfs_iop_getxattr,
        .listxattr      = kernfs_iop_listxattr,
 
        .mkdir          = kernfs_iop_mkdir,