From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jan 2016 21:32:10 +0000 (-0800)
Subject: Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.5~405
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddf1d6238dd13a3bd948e8fcb1109798ef0af49b;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull vfs xattr updates from Al Viro:
 "Andreas' xattr cleanup series.

  It's a followup to his xattr work that went in last cycle; -0.5KLoC"

* 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xattr handlers: Simplify list operation
  ocfs2: Replace list xattr handler operations
  nfs: Move call to security_inode_listsecurity into nfs_listxattr
  xfs: Change how listxattr generates synthetic attributes
  tmpfs: listxattr should include POSIX ACL xattrs
  tmpfs: Use xattr handler infrastructure
  btrfs: Use xattr handler infrastructure
  vfs: Distinguish between full xattr names and proper prefixes
  posix acls: Remove duplicate xattr name definitions
  gfs2: Remove gfs2_xattr_acl_chmod
  vfs: Remove vfs_xattr_cmp
---

ddf1d6238dd13a3bd948e8fcb1109798ef0af49b
diff --cc mm/shmem.c
index d00c92f,297390f..5813b7f
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@@ -2662,23 -2612,24 +2615,23 @@@ static ssize_t shmem_listxattr(struct d
  
  static const struct inode_operations shmem_short_symlink_operations = {
  	.readlink	= generic_readlink,
 -	.follow_link	= simple_follow_link,
 +	.get_link	= simple_get_link,
  #ifdef CONFIG_TMPFS_XATTR
- 	.setxattr	= shmem_setxattr,
- 	.getxattr	= shmem_getxattr,
+ 	.setxattr	= generic_setxattr,
+ 	.getxattr	= generic_getxattr,
  	.listxattr	= shmem_listxattr,
- 	.removexattr	= shmem_removexattr,
+ 	.removexattr	= generic_removexattr,
  #endif
  };
  
  static const struct inode_operations shmem_symlink_inode_operations = {
  	.readlink	= generic_readlink,
 -	.follow_link	= shmem_follow_link,
 -	.put_link	= shmem_put_link,
 +	.get_link	= shmem_get_link,
  #ifdef CONFIG_TMPFS_XATTR
- 	.setxattr	= shmem_setxattr,
- 	.getxattr	= shmem_getxattr,
+ 	.setxattr	= generic_setxattr,
+ 	.getxattr	= generic_getxattr,
  	.listxattr	= shmem_listxattr,
- 	.removexattr	= shmem_removexattr,
+ 	.removexattr	= generic_removexattr,
  #endif
  };