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

2 files changed, 0 insertions, 12 deletions

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 90f815bdfa8a..2f8c5c9bdaf6 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -260,10 +260,7 @@ const struct file_operations reiserfs_file_operations = {
 
 const struct inode_operations reiserfs_file_inode_operations = {
         .setattr = reiserfs_setattr,
-        .setxattr = generic_setxattr,
-        .getxattr = generic_getxattr,
         .listxattr = reiserfs_listxattr,
-        .removexattr = generic_removexattr,
         .permission = reiserfs_permission,
         .get_acl = reiserfs_get_acl,
         .set_acl = reiserfs_set_acl,
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 8a36696d6df9..fd7d0606aa96 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -1650,10 +1650,7 @@ const struct inode_operations reiserfs_dir_inode_operations = {
         .mknod = reiserfs_mknod,
         .rename = reiserfs_rename,
         .setattr = reiserfs_setattr,
-        .setxattr = generic_setxattr,
-        .getxattr = generic_getxattr,
         .listxattr = reiserfs_listxattr,
-        .removexattr = generic_removexattr,
         .permission = reiserfs_permission,
         .get_acl = reiserfs_get_acl,
         .set_acl = reiserfs_set_acl,
@@ -1667,10 +1664,7 @@ const struct inode_operations reiserfs_symlink_inode_operations = {
         .readlink = generic_readlink,
         .get_link       = page_get_link,
         .setattr = reiserfs_setattr,
-        .setxattr = generic_setxattr,
-        .getxattr = generic_getxattr,
         .listxattr = reiserfs_listxattr,
-        .removexattr = generic_removexattr,
         .permission = reiserfs_permission,
 };
 
@@ -1679,10 +1673,7 @@ const struct inode_operations reiserfs_symlink_inode_operations = {
  */
 const struct inode_operations reiserfs_special_inode_operations = {
         .setattr = reiserfs_setattr,
-        .setxattr = generic_setxattr,
-        .getxattr = generic_getxattr,
         .listxattr = reiserfs_listxattr,
-        .removexattr = generic_removexattr,
         .permission = reiserfs_permission,
         .get_acl = reiserfs_get_acl,
         .set_acl = reiserfs_set_acl,