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

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

diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 423cc01..a0e1478 100644 (file)
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -234,16 +234,14 @@ const struct file_operations ext2_file_operations = {
        .open           = dquot_file_open,
        .release        = ext2_release_file,
        .fsync          = ext2_fsync,
+       .get_unmapped_area = thp_get_unmapped_area,
        .splice_read    = generic_file_splice_read,
        .splice_write   = iter_file_splice_write,
 };
 
 const struct inode_operations ext2_file_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,