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

diff --cc Documentation/filesystems/vfs.txt
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/file.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/namei.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/symlink.c
Simple merge

diff --cc fs/9p/vfs_inode_dotl.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/cachefiles/namei.c
Simple merge

diff --cc fs/ceph/inode.c
Simple merge

diff --cc fs/ecryptfs/inode.c
Simple merge

diff --cc fs/ext2/file.c
Simple merge

diff --cc fs/ext4/file.c
Simple merge

diff --cc fs/ext4/namei.c
Simple merge

diff --cc fs/ext4/symlink.c
Simple merge

diff --cc fs/f2fs/file.c
Simple merge

diff --cc fs/f2fs/namei.c
Simple merge

diff --cc fs/fuse/dir.c
index a430c19607f4eae83e76bc3bf353c219a74ff878,dbf77fe1dc2e2f3631795430c0af11924096d6f0..572d12410c7c1ad405e753cb0627d77186259406
--- 1/fs/fuse/dir.c
--- 2/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -1801,12 -1739,7 +1801,9 @@@ static const struct inode_operations fu
        .mknod          = fuse_mknod,
        .permission     = fuse_permission,
        .getattr        = fuse_getattr,
-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,
        .listxattr      = fuse_listxattr,
-       .removexattr    = generic_removexattr,
 +      .get_acl        = fuse_get_acl,
 +      .set_acl        = fuse_set_acl,
  };
  
  static const struct file_operations fuse_dir_operations = {
@@@ -1824,12 -1757,7 +1821,9 @@@ static const struct inode_operations fu
        .setattr        = fuse_setattr,
        .permission     = fuse_permission,
        .getattr        = fuse_getattr,
-       .setxattr       = generic_setxattr,
-       .getxattr       = generic_getxattr,
        .listxattr      = fuse_listxattr,
-       .removexattr    = generic_removexattr,
 +      .get_acl        = fuse_get_acl,
 +      .set_acl        = fuse_set_acl,
  };
  
  static const struct inode_operations fuse_symlink_inode_operations = {

diff --cc fs/gfs2/inode.c
Simple merge

diff --cc fs/hfs/inode.c
Simple merge

diff --cc fs/hfsplus/inode.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/jfs/file.c
Simple merge

diff --cc fs/kernfs/inode.c
Simple merge

diff --cc fs/libfs.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/orangefs/inode.c
Simple merge

diff --cc fs/orangefs/namei.c
Simple merge

diff --cc fs/overlayfs/copy_up.c
Simple merge

diff --cc fs/overlayfs/dir.c
Simple merge

diff --cc fs/overlayfs/inode.c
Simple merge

diff --cc fs/overlayfs/super.c
Simple merge

diff --cc fs/ubifs/file.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc security/integrity/ima/ima_appraise.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge