xattr: Add __vfs_{get,set,remove}xattr helpers

Right now, various places in the kernel check for the existence of
getxattr, setxattr, and removexattr inode operations and directly call
those operations.  Switch to helper functions and test for the IOP_XATTR
flag instead.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Acked-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 7 insertions, 12 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 13185a6c266a..3db31ac7986b 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) {