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

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

34 files changed, 94 insertions, 85 deletions

diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index f1b87d8aa2da..57bb3754a027 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -525,3 +525,9 @@ in your dentry operations instead.
         set_delayed_call() where it used to set *cookie.
         ->put_link() is gone - just give the destructor to set_delayed_call()
         in ->get_link().
+--
+[mandatory]
+        ->getxattr() and xattr_handler.get() get dentry and inode passed separately.
+        dentry might be yet to be attached to inode, so do _not_ use its ->d_inode
+        in the instances.  Rationale: !@#!@# security_d_instantiate() needs to be
+        called before we attach dentry to inode.
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 3e1572cb457b..d28efd27af57 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -1042,8 +1042,8 @@ static inline __u64 ll_file_maxbytes(struct inode *inode)
 /* llite/xattr.c */
 int ll_setxattr(struct dentry *dentry, const char *name,
                 const void *value, size_t size, int flags);
-ssize_t ll_getxattr(struct dentry *dentry, const char *name,
-                    void *buffer, size_t size);
+ssize_t ll_getxattr(struct dentry *dentry, struct inode *inode,
+                    const char *name, void *buffer, size_t size);
 ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size);
 int ll_removexattr(struct dentry *dentry, const char *name);
 
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index b68dcc921ca2..c671f221c28c 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -451,11 +451,9 @@ out:
         return rc;
 }
 
-ssize_t ll_getxattr(struct dentry *dentry, const char *name,
-                    void *buffer, size_t size)
+ssize_t ll_getxattr(struct dentry *dentry, struct inode *inode,
+                    const char *name, void *buffer, size_t size)
 {
-        struct inode *inode = d_inode(dentry);
-
         LASSERT(inode);
         LASSERT(name);
 
diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 103f5d7c3083..72e35b721608 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -106,8 +106,8 @@ static int bad_inode_setxattr(struct dentry *dentry, const char *name,
         return -EIO;
 }
 
-static ssize_t bad_inode_getxattr(struct dentry *dentry, const char *name,
-                        void *buffer, size_t size)
+static ssize_t bad_inode_getxattr(struct dentry *dentry, struct inode *inode,
+                        const char *name, void *buffer, size_t size)
 {
         return -EIO;
 }
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index e705c4d612d7..beb893bb234f 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -795,7 +795,7 @@ extern int ceph_setxattr(struct dentry *, const char *, const void *,
 int __ceph_setxattr(struct dentry *, const char *, const void *, size_t, int);
 ssize_t __ceph_getxattr(struct inode *, const char *, void *, size_t);
 int __ceph_removexattr(struct dentry *, const char *);
-extern ssize_t ceph_getxattr(struct dentry *, const char *, void *, size_t);
+extern ssize_t ceph_getxattr(struct dentry *, struct inode *, const char *, void *, size_t);
 extern ssize_t ceph_listxattr(struct dentry *, char *, size_t);
 extern int ceph_removexattr(struct dentry *, const char *);
 extern void __ceph_build_xattrs_blob(struct ceph_inode_info *ci);
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 9410abdef3ce..c6e917d360f7 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -804,13 +804,13 @@ out:
         return err;
 }
 
-ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,
-                      size_t size)
+ssize_t ceph_getxattr(struct dentry *dentry, struct inode *inode,
+                      const char *name, void *value, size_t size)
 {
         if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
-                return generic_getxattr(dentry, name, value, size);
+                return generic_getxattr(dentry, inode, name, value, size);
 
-        return __ceph_getxattr(d_inode(dentry), name, value, size);
+        return __ceph_getxattr(inode, name, value, size);
 }
 
 ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 83aac8ba50b0..c89ecd7a5c39 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -123,7 +123,7 @@ extern int cifs_symlink(struct inode *inode, struct dentry *direntry,
 extern int      cifs_removexattr(struct dentry *, const char *);
 extern int      cifs_setxattr(struct dentry *, const char *, const void *,
                         size_t, int);
-extern ssize_t  cifs_getxattr(struct dentry *, const char *, void *, size_t);
+extern ssize_t  cifs_getxattr(struct dentry *, struct inode *, const char *, void *, size_t);
 extern ssize_t  cifs_listxattr(struct dentry *, char *, size_t);
 extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
 #ifdef CONFIG_CIFS_NFSD_EXPORT
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index 159547c8a40b..5d57c85703a9 100644
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -213,8 +213,8 @@ set_ea_exit:
         return rc;
 }
 
-ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
-        void *ea_value, size_t buf_size)
+ssize_t cifs_getxattr(struct dentry *direntry, struct inode *inode,
+        const char *ea_name, void *ea_value, size_t buf_size)
 {
         ssize_t rc = -EOPNOTSUPP;
 #ifdef CONFIG_CIFS_XATTR
@@ -296,7 +296,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                                 goto get_ea_exit; /* rc already EOPNOTSUPP */
 
                         pacl = pTcon->ses->server->ops->get_acl(cifs_sb,
-                                        d_inode(direntry), full_path, &acllen);
+                                        inode, full_path, &acllen);
                         if (IS_ERR(pacl)) {
                                 rc = PTR_ERR(pacl);
                                 cifs_dbg(VFS, "%s: error %zd getting sec desc\n",
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 64026e53722a..543a146ee019 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1369,7 +1369,9 @@ int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode)
         ssize_t size;
         int rc = 0;
 
-        size = ecryptfs_getxattr_lower(lower_dentry, ECRYPTFS_XATTR_NAME,
+        size = ecryptfs_getxattr_lower(lower_dentry,
+                                       ecryptfs_inode_to_lower(ecryptfs_inode),
+                                       ECRYPTFS_XATTR_NAME,
                                        page_virt, ECRYPTFS_DEFAULT_EXTENT_SIZE);
         if (size < 0) {
                 if (unlikely(ecryptfs_verbosity > 0))
@@ -1391,6 +1393,7 @@ int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
         int rc;
 
         rc = ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry),
+                                     ecryptfs_inode_to_lower(inode),
                                      ECRYPTFS_XATTR_NAME, file_size,
                                      ECRYPTFS_SIZE_AND_MARKER_BYTES);
         if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index d123fbaa28e0..6ff907f73331 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -607,8 +607,8 @@ ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,
                           unsigned char *src, struct dentry *ecryptfs_dentry);
 int ecryptfs_truncate(struct dentry *dentry, loff_t new_length);
 ssize_t
-ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
-                        void *value, size_t size);
+ecryptfs_getxattr_lower(struct dentry *lower_dentry, struct inode *lower_inode,
+                        const char *name, void *value, size_t size);
 int
 ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
                   size_t size, int flags);
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 121114e9a464..1ac631cd9d84 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -1033,29 +1033,30 @@ out:
 }
 
 ssize_t
-ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
-                        void *value, size_t size)
+ecryptfs_getxattr_lower(struct dentry *lower_dentry, struct inode *lower_inode,
+                        const char *name, void *value, size_t size)
 {
         int rc = 0;
 
-        if (!d_inode(lower_dentry)->i_op->getxattr) {
+        if (!lower_inode->i_op->getxattr) {
                 rc = -EOPNOTSUPP;
                 goto out;
         }
-        inode_lock(d_inode(lower_dentry));
-        rc = d_inode(lower_dentry)->i_op->getxattr(lower_dentry, name, value,
-                                                   size);
-        inode_unlock(d_inode(lower_dentry));
+        inode_lock(lower_inode);
+        rc = lower_inode->i_op->getxattr(lower_dentry, lower_inode,
+                                         name, value, size);
+        inode_unlock(lower_inode);
 out:
         return rc;
 }
 
 static ssize_t
-ecryptfs_getxattr(struct dentry *dentry, const char *name, void *value,
-                  size_t size)
+ecryptfs_getxattr(struct dentry *dentry, struct inode *inode,
+                  const char *name, void *value, size_t size)
 {
-        return ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry), name,
-                                       value, size);
+        return ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry),
+                                       ecryptfs_inode_to_lower(inode),
+                                       name, value, size);
 }
 
 static ssize_t
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 1f5865263b3e..39e4381d3a65 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -436,7 +436,8 @@ static int ecryptfs_write_inode_size_to_xattr(struct inode *ecryptfs_inode)
                 goto out;
         }
         inode_lock(lower_inode);
-        size = lower_inode->i_op->getxattr(lower_dentry, ECRYPTFS_XATTR_NAME,
+        size = lower_inode->i_op->getxattr(lower_dentry, lower_inode,
+                                           ECRYPTFS_XATTR_NAME,
                                            xattr_virt, PAGE_CACHE_SIZE);
         if (size < 0)
                 size = 8;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 4b855b65d457..b618527c05c6 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1759,10 +1759,9 @@ static int fuse_setxattr(struct dentry *entry, const char *name,
         return err;
 }
 
-static ssize_t fuse_getxattr(struct dentry *entry, const char *name,
-                             void *value, size_t size)
+static ssize_t fuse_getxattr(struct dentry *entry, struct inode *inode,
+                             const char *name, void *value, size_t size)
 {
-        struct inode *inode = d_inode(entry);
         struct fuse_conn *fc = get_fuse_conn(inode);
         FUSE_ARGS(args);
         struct fuse_getxattr_in inarg;
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index bb30f9a72c65..45f516cada78 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1968,22 +1968,21 @@ static int gfs2_setxattr(struct dentry *dentry, const char *name,
         return ret;
 }
 
-static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name,
-                             void *data, size_t size)
+static ssize_t gfs2_getxattr(struct dentry *dentry, struct inode *inode,
+                             const char *name, void *data, size_t size)
 {
-        struct inode *inode = d_inode(dentry);
         struct gfs2_inode *ip = GFS2_I(inode);
         struct gfs2_holder gh;
         int ret;
 
         /* For selinux during lookup */
         if (gfs2_glock_is_locked_by_me(ip->i_gl))
-                return generic_getxattr(dentry, name, data, size);
+                return generic_getxattr(dentry, inode, name, data, size);
 
         gfs2_holder_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
         ret = gfs2_glock_nq(&gh);
         if (ret == 0) {
-                ret = generic_getxattr(dentry, name, data, size);
+                ret = generic_getxattr(dentry, inode, name, data, size);
                 gfs2_glock_dq(&gh);
         }
         gfs2_holder_uninit(&gh);
diff --git a/fs/hfs/attr.c b/fs/hfs/attr.c
index 8d931b157bbe..064f92f17efc 100644
--- a/fs/hfs/attr.c
+++ b/fs/hfs/attr.c
@@ -56,10 +56,9 @@ out:
         return res;
 }
 
-ssize_t hfs_getxattr(struct dentry *dentry, const char *name,
-                         void *value, size_t size)
+ssize_t hfs_getxattr(struct dentry *unused, struct inode *inode,
+                     const char *name, void *value, size_t size)
 {
-        struct inode *inode = d_inode(dentry);
         struct hfs_find_data fd;
         hfs_cat_rec rec;
         struct hfs_cat_file *file;
diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h
index 1f1c7dcbcc2f..79daa097929a 100644
--- a/fs/hfs/hfs_fs.h
+++ b/fs/hfs/hfs_fs.h
@@ -213,8 +213,8 @@ extern void hfs_delete_inode(struct inode *);
 /* attr.c */
 extern int hfs_setxattr(struct dentry *dentry, const char *name,
                         const void *value, size_t size, int flags);
-extern ssize_t hfs_getxattr(struct dentry *dentry, const char *name,
-                            void *value, size_t size);
+extern ssize_t hfs_getxattr(struct dentry *dentry, struct inode *inode,
+                            const char *name, void *value, size_t size);
 extern ssize_t hfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
 
 /* mdb.c */
diff --git a/fs/jfs/jfs_xattr.h b/fs/jfs/jfs_xattr.h
index e8d717dabca3..e69e14f3777b 100644
--- a/fs/jfs/jfs_xattr.h
+++ b/fs/jfs/jfs_xattr.h
@@ -57,7 +57,7 @@ extern int __jfs_setxattr(tid_t, struct inode *, const char *, const void *,
 extern int jfs_setxattr(struct dentry *, const char *, const void *, size_t,
                         int);
 extern ssize_t __jfs_getxattr(struct inode *, const char *, void *, size_t);
-extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t);
+extern ssize_t jfs_getxattr(struct dentry *, struct inode *, const char *, void *, size_t);
 extern ssize_t jfs_listxattr(struct dentry *, char *, size_t);
 extern int jfs_removexattr(struct dentry *, const char *);
 
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 48b15a6e5558..5becc6a3ff8c 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -933,8 +933,8 @@ ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data,
         return size;
 }
 
-ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data,
-                     size_t buf_size)
+ssize_t jfs_getxattr(struct dentry *dentry, struct inode *inode,
+                     const char *name, void *data, size_t buf_size)
 {
         int err;
 
@@ -944,7 +944,7 @@ ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data,
          * for it via sb->s_xattr.
          */
         if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
-                return generic_getxattr(dentry, name, data, buf_size);
+                return generic_getxattr(dentry, inode, name, data, buf_size);
 
         if (strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) == 0) {
                 /*
@@ -959,7 +959,7 @@ ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data,
                         return -EOPNOTSUPP;
         }
 
-        err = __jfs_getxattr(d_inode(dentry), name, data, buf_size);
+        err = __jfs_getxattr(inode, name, data, buf_size);
 
         return err;
 }
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index 16405ae88d2d..b5247226732b 100644
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -208,10 +208,10 @@ int kernfs_iop_removexattr(struct dentry *dentry, const char *name)
         return simple_xattr_set(&attrs->xattrs, name, NULL, 0, XATTR_REPLACE);
 }
 
-ssize_t kernfs_iop_getxattr(struct dentry *dentry, const char *name, void *buf,
-                            size_t size)
+ssize_t kernfs_iop_getxattr(struct dentry *unused, struct inode *inode,
+                            const char *name, void *buf, size_t size)
 {
-        struct kernfs_node *kn = dentry->d_fsdata;
+        struct kernfs_node *kn = inode->i_private;
         struct kernfs_iattrs *attrs;
 
         attrs = kernfs_iattrs(kn);
diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h
index 6762bfbd8207..45c9192c276e 100644
--- a/fs/kernfs/kernfs-internal.h
+++ b/fs/kernfs/kernfs-internal.h
@@ -84,8 +84,8 @@ int kernfs_iop_getattr(struct vfsmount *mnt, struct dentry *dentry,
 int kernfs_iop_setxattr(struct dentry *dentry, const char *name, const void *value,
                         size_t size, int flags);
 int kernfs_iop_removexattr(struct dentry *dentry, const char *name);
-ssize_t kernfs_iop_getxattr(struct dentry *dentry, const char *name, void *buf,
-                            size_t size);
+ssize_t kernfs_iop_getxattr(struct dentry *dentry, struct inode *inode,
+                            const char *name, void *buf, size_t size);
 ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size);
 
 /*
diff --git a/fs/libfs.c b/fs/libfs.c
index 0ca80b2af420..03332f4bdedf 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -1127,8 +1127,8 @@ static int empty_dir_setxattr(struct dentry *dentry, const char *name,
         return -EOPNOTSUPP;
 }
 
-static ssize_t empty_dir_getxattr(struct dentry *dentry, const char *name,
-                                  void *value, size_t size)
+static ssize_t empty_dir_getxattr(struct dentry *dentry, struct inode *inode,
+                                  const char *name, void *value, size_t size)
 {
         return -EOPNOTSUPP;
 }
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index a4ff5d0d7db9..c7b31a03dc9c 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -246,8 +246,8 @@ static bool ovl_need_xattr_filter(struct dentry *dentry,
                 return false;
 }
 
-ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
-                     void *value, size_t size)
+ssize_t ovl_getxattr(struct dentry *dentry, struct inode *inode,
+                     const char *name, void *value, size_t size)
 {
         struct path realpath;
         enum ovl_path_type type = ovl_path_real(dentry, &realpath);
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 6a7090f4a441..99ec4b035237 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -173,8 +173,8 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr);
 int ovl_permission(struct inode *inode, int mask);
 int ovl_setxattr(struct dentry *dentry, const char *name,
                  const void *value, size_t size, int flags);
-ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
-                     void *value, size_t size);
+ssize_t ovl_getxattr(struct dentry *dentry, struct inode *inode,
+                     const char *name, void *value, size_t size);
 ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
 int ovl_removexattr(struct dentry *dentry, const char *name);
 struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags);
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index ef64984c9bbc..14cab381cece 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -274,7 +274,7 @@ static bool ovl_is_opaquedir(struct dentry *dentry)
         if (!S_ISDIR(inode->i_mode) || !inode->i_op->getxattr)
                 return false;
 
-        res = inode->i_op->getxattr(dentry, OVL_XATTR_OPAQUE, &val, 1);
+        res = inode->i_op->getxattr(dentry, inode, OVL_XATTR_OPAQUE, &val, 1);
         if (res == 1 && val == 'y')
                 return true;
 
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index c2a57e193a81..536fb495f2f1 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1734,8 +1734,8 @@ int ubifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
 /* xattr.c */
 int ubifs_setxattr(struct dentry *dentry, const char *name,
                    const void *value, size_t size, int flags);
-ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
-                       size_t size);
+ssize_t ubifs_getxattr(struct dentry *dentry, struct inode *host,
+                       const char *name, void *buf, size_t size);
 ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size);
 int ubifs_removexattr(struct dentry *dentry, const char *name);
 int ubifs_init_security(struct inode *dentry, struct inode *inode,
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index b043e044121d..413d650c9476 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -372,10 +372,10 @@ int ubifs_setxattr(struct dentry *dentry, const char *name,
         return setxattr(d_inode(dentry), name, value, size, flags);
 }
 
-ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
-                       size_t size)
+ssize_t ubifs_getxattr(struct dentry *dentry, struct inode *host,
+                       const char *name, void *buf, size_t size)
 {
-        struct inode *inode, *host = d_inode(dentry);
+        struct inode *inode;
         struct ubifs_info *c = host->i_sb->s_fs_info;
         struct qstr nm = QSTR_INIT(name, strlen(name));
         struct ubifs_inode *ui;
diff --git a/fs/xattr.c b/fs/xattr.c
index 461ba45b7da9..b11945e15fde 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -192,7 +192,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
         if (!inode->i_op->getxattr)
                 return -EOPNOTSUPP;
 
-        error = inode->i_op->getxattr(dentry, name, NULL, 0);
+        error = inode->i_op->getxattr(dentry, inode, name, NULL, 0);
         if (error < 0)
                 return error;
 
@@ -203,7 +203,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
                 memset(value, 0, error + 1);
         }
 
-        error = inode->i_op->getxattr(dentry, name, value, error);
+        error = inode->i_op->getxattr(dentry, inode, name, value, error);
         *xattr_value = value;
         return error;
 }
@@ -236,7 +236,7 @@ vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
         }
 nolsm:
         if (inode->i_op->getxattr)
-                error = inode->i_op->getxattr(dentry, name, value, size);
+                error = inode->i_op->getxattr(dentry, inode, name, value, size);
         else
                 error = -EOPNOTSUPP;
 
@@ -691,14 +691,15 @@ xattr_resolve_name(const struct xattr_handler **handlers, const char **name)
  * Find the handler for the prefix and dispatch its get() operation.
  */
 ssize_t
-generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size)
+generic_getxattr(struct dentry *dentry, struct inode *inode,
+                 const char *name, void *buffer, size_t size)
 {
         const struct xattr_handler *handler;
 
         handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
         if (IS_ERR(handler))
                 return PTR_ERR(handler);
-        return handler->get(handler, dentry, d_inode(dentry),
+        return handler->get(handler, dentry, inode,
                             name, buffer, size);
 }
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 329ed372d708..1b5fcaeea827 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1702,7 +1702,8 @@ struct inode_operations {
         int (*setattr) (struct dentry *, struct iattr *);
         int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
         int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
-        ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+        ssize_t (*getxattr) (struct dentry *, struct inode *,
+                             const char *, void *, size_t);
         ssize_t (*listxattr) (struct dentry *, char *, size_t);
         int (*removexattr) (struct dentry *, const char *);
         int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index c11c022298b9..1cc4c578deb9 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -52,7 +52,7 @@ int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, i
 int vfs_setxattr(struct dentry *, const char *, const void *, size_t, int);
 int vfs_removexattr(struct dentry *, const char *);
 
-ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size);
+ssize_t generic_getxattr(struct dentry *dentry, struct inode *inode, const char *name, void *buffer, size_t size);
 ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size);
 int generic_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags);
 int generic_removexattr(struct dentry *dentry, const char *name);
diff --git a/net/socket.c b/net/socket.c
index 5f77a8e93830..35e4523edada 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -466,7 +466,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
 #define XATTR_SOCKPROTONAME_SUFFIX "sockprotoname"
 #define XATTR_NAME_SOCKPROTONAME (XATTR_SYSTEM_PREFIX XATTR_SOCKPROTONAME_SUFFIX)
 #define XATTR_NAME_SOCKPROTONAME_LEN (sizeof(XATTR_NAME_SOCKPROTONAME)-1)
-static ssize_t sockfs_getxattr(struct dentry *dentry,
+static ssize_t sockfs_getxattr(struct dentry *dentry, struct inode *inode,
                                const char *name, void *value, size_t size)
 {
         const char *proto_name;
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,