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, 6 insertions, 6 deletions

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index caec2256ab22..1cb060293505 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -265,14 +265,14 @@ static struct smack_known *smk_fetch(const char *name, struct inode *ip,
         char *buffer;
         struct smack_known *skp = NULL;
 
-        if (ip->i_op->getxattr == NULL)
+        if (!(ip->i_opflags & IOP_XATTR))
                 return ERR_PTR(-EOPNOTSUPP);
 
         buffer = kzalloc(SMK_LONGLABEL, GFP_KERNEL);
         if (buffer == NULL)
                 return ERR_PTR(-ENOMEM);
 
-        rc = ip->i_op->getxattr(dp, ip, name, buffer, SMK_LONGLABEL);
+        rc = __vfs_getxattr(dp, ip, name, buffer, SMK_LONGLABEL);
         if (rc < 0)
                 skp = ERR_PTR(rc);
         else if (rc == 0)
@@ -3520,8 +3520,8 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                  * It would be curious if the label of the task
                  * does not match that assigned.
                  */
-                if (inode->i_op->getxattr == NULL)
-                        break;
+                if (!(inode->i_opflags & IOP_XATTR))
+                        break;
                 /*
                  * Get the dentry for xattr.
                  */
@@ -3545,12 +3545,12 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                          */
                         if (isp->smk_flags & SMK_INODE_CHANGED) {
                                 isp->smk_flags &= ~SMK_INODE_CHANGED;
-                                rc = inode->i_op->setxattr(dp, inode,
+                                rc = __vfs_setxattr(dp, inode,
                                         XATTR_NAME_SMACKTRANSMUTE,
                                         TRANS_TRUE, TRANS_TRUE_SIZE,
                                         0);
                         } else {
-                                rc = inode->i_op->getxattr(dp, inode,
+                                rc = __vfs_getxattr(dp, inode,
                                         XATTR_NAME_SMACKTRANSMUTE, trattr,
                                         TRANS_TRUE_SIZE);
                                 if (rc >= 0 && strncmp(trattr, TRANS_TRUE,