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

Pull vfs xattr updates from Al Viro:
 "xattr stuff from Andreas

  This completes the switch to xattr_handler ->get()/->set() from
  ->getxattr/->setxattr/->removexattr"

* 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: Remove {get,set,remove}xattr inode operations
  xattr: Stop calling {get,set,remove}xattr inode operations
  vfs: Check for the IOP_XATTR flag in listxattr
  xattr: Add __vfs_{get,set,remove}xattr helpers
  libfs: Use IOP_XATTR flag for empty directory handling
  vfs: Use IOP_XATTR flag for bad-inode handling
  vfs: Add IOP_XATTR inode operations flag
  vfs: Move xattr_resolve_name to the front of fs/xattr.c
  ecryptfs: Switch to generic xattr handlers
  sockfs: Get rid of getxattr iop
  sockfs: getxattr: Fail with -EOPNOTSUPP for invalid attribute names
  kernfs: Switch to generic xattr handlers
  hfs: Switch to generic xattr handlers
  jffs2: Remove jffs2_{get,set,remove}xattr macros
  xattr: Remove unnecessary NULL attribute name check

1 files changed, 0 insertions, 15 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 828253ab772c..8596217b5e26 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3175,10 +3175,7 @@ static const struct inode_operations shmem_short_symlink_operations = {
         .readlink       = generic_readlink,
         .get_link       = simple_get_link,
 #ifdef CONFIG_TMPFS_XATTR
-        .setxattr       = generic_setxattr,
-        .getxattr       = generic_getxattr,
         .listxattr      = shmem_listxattr,
-        .removexattr    = generic_removexattr,
 #endif
 };
 
@@ -3186,10 +3183,7 @@ static const struct inode_operations shmem_symlink_inode_operations = {
         .readlink       = generic_readlink,
         .get_link       = shmem_get_link,
 #ifdef CONFIG_TMPFS_XATTR
-        .setxattr       = generic_setxattr,
-        .getxattr       = generic_getxattr,
         .listxattr      = shmem_listxattr,
-        .removexattr    = generic_removexattr,
 #endif
 };
 
@@ -3683,10 +3677,7 @@ static const struct inode_operations shmem_inode_operations = {
         .getattr        = shmem_getattr,
         .setattr        = shmem_setattr,
 #ifdef CONFIG_TMPFS_XATTR
-        .setxattr       = generic_setxattr,
-        .getxattr       = generic_getxattr,
         .listxattr      = shmem_listxattr,
-        .removexattr    = generic_removexattr,
         .set_acl        = simple_set_acl,
 #endif
 };
@@ -3705,10 +3696,7 @@ static const struct inode_operations shmem_dir_inode_operations = {
         .tmpfile        = shmem_tmpfile,
 #endif
 #ifdef CONFIG_TMPFS_XATTR
-        .setxattr       = generic_setxattr,
-        .getxattr       = generic_getxattr,
         .listxattr      = shmem_listxattr,
-        .removexattr    = generic_removexattr,
 #endif
 #ifdef CONFIG_TMPFS_POSIX_ACL
         .setattr        = shmem_setattr,
@@ -3718,10 +3706,7 @@ static const struct inode_operations shmem_dir_inode_operations = {
 
 static const struct inode_operations shmem_special_inode_operations = {
 #ifdef CONFIG_TMPFS_XATTR
-        .setxattr       = generic_setxattr,
-        .getxattr       = generic_getxattr,
         .listxattr      = shmem_listxattr,
-        .removexattr    = generic_removexattr,
 #endif
 #ifdef CONFIG_TMPFS_POSIX_ACL
         .setattr        = shmem_setattr,