From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Oct 2016 00:11:50 +0000 (-0700)
Subject: Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.13~2118
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=97d2116708ca0fd6ad8b00811ee4349b7e19e96f;p=mirror_ubuntu-bionic-kernel.git

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
---

97d2116708ca0fd6ad8b00811ee4349b7e19e96f
diff --cc fs/fuse/dir.c
index a430c19607f4,dbf77fe1dc2e..572d12410c7c
--- a/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 = {