->getxattr(): pass dentry and inode as separate arguments

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 11 insertions, 10 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 48071ed7c445..a042077312a5 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -313,7 +313,7 @@ int cap_inode_need_killpriv(struct dentry *dentry)
         if (!inode->i_op->getxattr)
                return 0;
 
-        error = inode->i_op->getxattr(dentry, XATTR_NAME_CAPS, NULL, 0);
+        error = inode->i_op->getxattr(dentry, inode, XATTR_NAME_CAPS, NULL, 0);
         if (error <= 0)
                 return 0;
         return 1;
@@ -397,8 +397,8 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
         if (!inode || !inode->i_op->getxattr)
                 return -ENODATA;
 
-        size = inode->i_op->getxattr((struct dentry *)dentry, XATTR_NAME_CAPS, &caps,
-                                   XATTR_CAPS_SZ);
+        size = inode->i_op->getxattr((struct dentry *)dentry, inode,
+                                     XATTR_NAME_CAPS, &caps, XATTR_CAPS_SZ);
         if (size == -ENODATA || size == -EOPNOTSUPP)
                 /* no data, that's ok */
                 return -ENODATA;
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index 84c6d11fc096..b9e26288d30c 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -82,7 +82,7 @@ static int evm_find_protected_xattrs(struct dentry *dentry)
                 return -EOPNOTSUPP;
 
         for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) {
-                error = inode->i_op->getxattr(dentry, *xattr, NULL, 0);
+                error = inode->i_op->getxattr(dentry, inode, *xattr, NULL, 0);
                 if (error < 0) {
                         if (error == -ENODATA)
                                 continue;
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 889cd59ca5a7..469f5c75bd4b 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -506,7 +506,8 @@ static int sb_finish_set_opts(struct super_block *sb)
                         rc = -EOPNOTSUPP;
                         goto out;
                 }
-                rc = root_inode->i_op->getxattr(root, XATTR_NAME_SELINUX, NULL, 0);
+                rc = root_inode->i_op->getxattr(root, root_inode,
+                                                XATTR_NAME_SELINUX, NULL, 0);
                 if (rc < 0 && rc != -ENODATA) {
                         if (rc == -EOPNOTSUPP)
                                 printk(KERN_WARNING "SELinux: (dev %s, type "
@@ -1412,13 +1413,13 @@ 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, XATTR_NAME_SELINUX,
+                rc = inode->i_op->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, XATTR_NAME_SELINUX,
+                        rc = inode->i_op->getxattr(dentry, inode, XATTR_NAME_SELINUX,
                                                    NULL, 0);
                         if (rc < 0) {
                                 dput(dentry);
@@ -1432,7 +1433,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,
+                        rc = inode->i_op->getxattr(dentry, inode,
                                                    XATTR_NAME_SELINUX,
                                                    context, len);
                 }
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 50bcca26c0b7..ff2b8c3cf7a9 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -272,7 +272,7 @@ static struct smack_known *smk_fetch(const char *name, struct inode *ip,
         if (buffer == NULL)
                 return ERR_PTR(-ENOMEM);
 
-        rc = ip->i_op->getxattr(dp, name, buffer, SMK_LONGLABEL);
+        rc = ip->i_op->getxattr(dp, ip, name, buffer, SMK_LONGLABEL);
         if (rc < 0)
                 skp = ERR_PTR(rc);
         else if (rc == 0)
@@ -3519,7 +3519,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
                                         TRANS_TRUE, TRANS_TRUE_SIZE,
                                         0);
                         } else {
-                                rc = inode->i_op->getxattr(dp,
+                                rc = inode->i_op->getxattr(dp, inode,
                                         XATTR_NAME_SMACKTRANSMUTE, trattr,
                                         TRANS_TRUE_SIZE);
                                 if (rc >= 0 && strncmp(trattr, TRANS_TRUE,