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

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 2205ea27aa0a..085057936287 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -507,14 +507,14 @@ static int sb_finish_set_opts(struct super_block *sb)
                    the root directory.  -ENODATA is ok, as this may be
                    the first boot of the SELinux kernel before we have
                    assigned xattr values to the filesystem. */
-                if (!root_inode->i_op->getxattr) {
+                if (!(root_inode->i_opflags & IOP_XATTR)) {
                         printk(KERN_WARNING "SELinux: (dev %s, type %s) has no "
                                "xattr support\n", sb->s_id, sb->s_type->name);
                         rc = -EOPNOTSUPP;
                         goto out;
                 }
-                rc = root_inode->i_op->getxattr(root, root_inode,
-                                                XATTR_NAME_SELINUX, NULL, 0);
+
+                rc = __vfs_getxattr(root, root_inode, XATTR_NAME_SELINUX, NULL, 0);
                 if (rc < 0 && rc != -ENODATA) {
                         if (rc == -EOPNOTSUPP)
                                 printk(KERN_WARNING "SELinux: (dev %s, type "
@@ -1410,11 +1410,10 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
         case SECURITY_FS_USE_NATIVE:
                 break;
         case SECURITY_FS_USE_XATTR:
-                if (!inode->i_op->getxattr) {
+                if (!(inode->i_opflags & IOP_XATTR)) {
                         isec->sid = sbsec->def_sid;
                         break;
                 }
-
                 /* Need a dentry, since the xattr API requires one.
                    Life would be simpler if we could just pass the inode. */
                 if (opt_dentry) {
@@ -1445,14 +1444,12 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                         goto out_unlock;
                 }
                 context[len] = '\0';
-                rc = inode->i_op->getxattr(dentry, inode, XATTR_NAME_SELINUX,
-                                           context, len);
+                rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context, len);
                 if (rc == -ERANGE) {
                         kfree(context);
 
                         /* Need a larger buffer.  Query for the right size. */
-                        rc = inode->i_op->getxattr(dentry, inode, XATTR_NAME_SELINUX,
-                                                   NULL, 0);
+                        rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, NULL, 0);
                         if (rc < 0) {
                                 dput(dentry);
                                 goto out_unlock;
@@ -1465,9 +1462,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                                 goto out_unlock;
                         }
                         context[len] = '\0';
-                        rc = inode->i_op->getxattr(dentry, inode,
-                                                   XATTR_NAME_SELINUX,
-                                                   context, len);
+                        rc = __vfs_getxattr(dentry, inode, XATTR_NAME_SELINUX, context, len);
                 }
                 dput(dentry);
                 if (rc < 0) {