VFS: normal filesystems (and lustre): d_inode() annotations

that's the bulk of filesystem drivers dealing with inodes of their own

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

7 files changed, 31 insertions, 31 deletions

diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
index b97359ba2648..652cd3c5b58c 100644
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -215,7 +215,7 @@ xfs_fs_get_parent(
         int                     error;
         struct xfs_inode        *cip;
 
-        error = xfs_lookup(XFS_I(child->d_inode), &xfs_name_dotdot, &cip, NULL);
+        error = xfs_lookup(XFS_I(d_inode(child)), &xfs_name_dotdot, &cip, NULL);
         if (unlikely(error))
                 return ERR_PTR(error);
 
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index a2e86e8a0fea..22807e1e9cca 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -294,7 +294,7 @@ xfs_filestream_get_parent(
         if (!parent)
                 goto out_dput;
 
-        dir = igrab(parent->d_inode);
+        dir = igrab(d_inode(parent));
         dput(parent);
 
 out_dput:
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index ac4feae45eb3..ed97bd48cf32 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -82,7 +82,7 @@ xfs_find_handle(
                 error = user_lpath((const char __user *)hreq->path, &path);
                 if (error)
                         return error;
-                inode = path.dentry->d_inode;
+                inode = d_inode(path.dentry);
         }
         ip = XFS_I(inode);
 
@@ -210,7 +210,7 @@ xfs_open_by_handle(
         dentry = xfs_handlereq_to_dentry(parfilp, hreq);
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);
-        inode = dentry->d_inode;
+        inode = d_inode(dentry);
 
         /* Restrict xfs_open_by_handle to directories & regular files. */
         if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) {
@@ -303,7 +303,7 @@ xfs_readlink_by_handle(
                 goto out_dput;
         }
 
-        error = xfs_readlink(XFS_I(dentry->d_inode), link);
+        error = xfs_readlink(XFS_I(d_inode(dentry)), link);
         if (error)
                 goto out_kfree;
         error = readlink_copy(hreq->ohandle, olen, link);
@@ -376,7 +376,7 @@ xfs_fssetdm_by_handle(
                 return PTR_ERR(dentry);
         }
 
-        if (IS_IMMUTABLE(dentry->d_inode) || IS_APPEND(dentry->d_inode)) {
+        if (IS_IMMUTABLE(d_inode(dentry)) || IS_APPEND(d_inode(dentry))) {
                 error = -EPERM;
                 goto out;
         }
@@ -386,7 +386,7 @@ xfs_fssetdm_by_handle(
                 goto out;
         }
 
-        error = xfs_set_dmattrs(XFS_I(dentry->d_inode), fsd.fsd_dmevmask,
+        error = xfs_set_dmattrs(XFS_I(d_inode(dentry)), fsd.fsd_dmevmask,
                                  fsd.fsd_dmstate);
 
  out:
@@ -429,7 +429,7 @@ xfs_attrlist_by_handle(
                 goto out_dput;
 
         cursor = (attrlist_cursor_kern_t *)&al_hreq.pos;
-        error = xfs_attr_list(XFS_I(dentry->d_inode), kbuf, al_hreq.buflen,
+        error = xfs_attr_list(XFS_I(d_inode(dentry)), kbuf, al_hreq.buflen,
                                         al_hreq.flags, cursor);
         if (error)
                 goto out_kfree;
@@ -559,7 +559,7 @@ xfs_attrmulti_by_handle(
                 switch (ops[i].am_opcode) {
                 case ATTR_OP_GET:
                         ops[i].am_error = xfs_attrmulti_attr_get(
-                                        dentry->d_inode, attr_name,
+                                        d_inode(dentry), attr_name,
                                         ops[i].am_attrvalue, &ops[i].am_length,
                                         ops[i].am_flags);
                         break;
@@ -568,7 +568,7 @@ xfs_attrmulti_by_handle(
                         if (ops[i].am_error)
                                 break;
                         ops[i].am_error = xfs_attrmulti_attr_set(
-                                        dentry->d_inode, attr_name,
+                                        d_inode(dentry), attr_name,
                                         ops[i].am_attrvalue, ops[i].am_length,
                                         ops[i].am_flags);
                         mnt_drop_write_file(parfilp);
@@ -578,7 +578,7 @@ xfs_attrmulti_by_handle(
                         if (ops[i].am_error)
                                 break;
                         ops[i].am_error = xfs_attrmulti_attr_remove(
-                                        dentry->d_inode, attr_name,
+                                        d_inode(dentry), attr_name,
                                         ops[i].am_flags);
                         mnt_drop_write_file(parfilp);
                         break;
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index bfc7c7c8a0c8..b88bdc85dd3d 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -375,7 +375,7 @@ xfs_compat_attrlist_by_handle(
                 goto out_dput;
 
         cursor = (attrlist_cursor_kern_t *)&al_hreq.pos;
-        error = xfs_attr_list(XFS_I(dentry->d_inode), kbuf, al_hreq.buflen,
+        error = xfs_attr_list(XFS_I(d_inode(dentry)), kbuf, al_hreq.buflen,
                                         al_hreq.flags, cursor);
         if (error)
                 goto out_kfree;
@@ -445,7 +445,7 @@ xfs_compat_attrmulti_by_handle(
                 switch (ops[i].am_opcode) {
                 case ATTR_OP_GET:
                         ops[i].am_error = xfs_attrmulti_attr_get(
-                                        dentry->d_inode, attr_name,
+                                        d_inode(dentry), attr_name,
                                         compat_ptr(ops[i].am_attrvalue),
                                         &ops[i].am_length, ops[i].am_flags);
                         break;
@@ -454,7 +454,7 @@ xfs_compat_attrmulti_by_handle(
                         if (ops[i].am_error)
                                 break;
                         ops[i].am_error = xfs_attrmulti_attr_set(
-                                        dentry->d_inode, attr_name,
+                                        d_inode(dentry), attr_name,
                                         compat_ptr(ops[i].am_attrvalue),
                                         ops[i].am_length, ops[i].am_flags);
                         mnt_drop_write_file(parfilp);
@@ -464,7 +464,7 @@ xfs_compat_attrmulti_by_handle(
                         if (ops[i].am_error)
                                 break;
                         ops[i].am_error = xfs_attrmulti_attr_remove(
-                                        dentry->d_inode, attr_name,
+                                        d_inode(dentry), attr_name,
                                         ops[i].am_flags);
                         mnt_drop_write_file(parfilp);
                         break;
@@ -504,7 +504,7 @@ xfs_compat_fssetdm_by_handle(
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);
 
-        if (IS_IMMUTABLE(dentry->d_inode) || IS_APPEND(dentry->d_inode)) {
+        if (IS_IMMUTABLE(d_inode(dentry)) || IS_APPEND(d_inode(dentry))) {
                 error = -EPERM;
                 goto out;
         }
@@ -514,7 +514,7 @@ xfs_compat_fssetdm_by_handle(
                 goto out;
         }
 
-        error = xfs_set_dmattrs(XFS_I(dentry->d_inode), fsd.fsd_dmevmask,
+        error = xfs_set_dmattrs(XFS_I(d_inode(dentry)), fsd.fsd_dmevmask,
                                  fsd.fsd_dmstate);
 
 out:
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index e53a90331422..54b95232d946 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -301,7 +301,7 @@ xfs_vn_link(
         struct inode    *dir,
         struct dentry   *dentry)
 {
-        struct inode    *inode = old_dentry->d_inode;
+        struct inode    *inode = d_inode(old_dentry);
         struct xfs_name name;
         int             error;
 
@@ -326,7 +326,7 @@ xfs_vn_unlink(
 
         xfs_dentry_to_name(&name, dentry, 0);
 
-        error = xfs_remove(XFS_I(dir), &name, XFS_I(dentry->d_inode));
+        error = xfs_remove(XFS_I(dir), &name, XFS_I(d_inode(dentry)));
         if (error)
                 return error;
 
@@ -384,7 +384,7 @@ xfs_vn_rename(
         struct dentry   *ndentry,
         unsigned int    flags)
 {
-        struct inode    *new_inode = ndentry->d_inode;
+        struct inode    *new_inode = d_inode(ndentry);
         int             omode = 0;
         struct xfs_name oname;
         struct xfs_name nname;
@@ -394,12 +394,12 @@ xfs_vn_rename(
 
         /* if we are exchanging files, we need to set i_mode of both files */
         if (flags & RENAME_EXCHANGE)
-                omode = ndentry->d_inode->i_mode;
+                omode = d_inode(ndentry)->i_mode;
 
         xfs_dentry_to_name(&oname, odentry, omode);
-        xfs_dentry_to_name(&nname, ndentry, odentry->d_inode->i_mode);
+        xfs_dentry_to_name(&nname, ndentry, d_inode(odentry)->i_mode);
 
-        return xfs_rename(XFS_I(odir), &oname, XFS_I(odentry->d_inode),
+        return xfs_rename(XFS_I(odir), &oname, XFS_I(d_inode(odentry)),
                           XFS_I(ndir), &nname,
                           new_inode ? XFS_I(new_inode) : NULL, flags);
 }
@@ -421,7 +421,7 @@ xfs_vn_follow_link(
         if (!link)
                 goto out_err;
 
-        error = xfs_readlink(XFS_I(dentry->d_inode), link);
+        error = xfs_readlink(XFS_I(d_inode(dentry)), link);
         if (unlikely(error))
                 goto out_kfree;
 
@@ -441,7 +441,7 @@ xfs_vn_getattr(
         struct dentry           *dentry,
         struct kstat            *stat)
 {
-        struct inode            *inode = dentry->d_inode;
+        struct inode            *inode = d_inode(dentry);
         struct xfs_inode        *ip = XFS_I(inode);
         struct xfs_mount        *mp = ip->i_mount;
 
@@ -968,14 +968,14 @@ xfs_vn_setattr(
         struct dentry           *dentry,
         struct iattr            *iattr)
 {
-        struct xfs_inode        *ip = XFS_I(dentry->d_inode);
+        struct xfs_inode        *ip = XFS_I(d_inode(dentry));
         int                     error;
 
         if (iattr->ia_valid & ATTR_SIZE) {
                 uint            iolock = XFS_IOLOCK_EXCL;
 
                 xfs_ilock(ip, iolock);
-                error = xfs_break_layouts(dentry->d_inode, &iolock);
+                error = xfs_break_layouts(d_inode(dentry), &iolock);
                 if (!error)
                         error = xfs_setattr_size(ip, iattr);
                 xfs_iunlock(ip, iolock);
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 8fcc4ccc5c79..72e97e31d3b1 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1083,7 +1083,7 @@ xfs_fs_statfs(
 {
         struct xfs_mount        *mp = XFS_M(dentry->d_sb);
         xfs_sb_t                *sbp = &mp->m_sb;
-        struct xfs_inode        *ip = XFS_I(dentry->d_inode);
+        struct xfs_inode        *ip = XFS_I(d_inode(dentry));
         __uint64_t              fakeinos, id;
         xfs_extlen_t            lsize;
         __int64_t               ffree;
diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
index 69f6e475de97..c036815183cb 100644
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -35,7 +35,7 @@ static int
 xfs_xattr_get(struct dentry *dentry, const char *name,
                 void *value, size_t size, int xflags)
 {
-        struct xfs_inode *ip = XFS_I(dentry->d_inode);
+        struct xfs_inode *ip = XFS_I(d_inode(dentry));
         int error, asize = size;
 
         if (strcmp(name, "") == 0)
@@ -57,7 +57,7 @@ static int
 xfs_xattr_set(struct dentry *dentry, const char *name, const void *value,
                 size_t size, int flags, int xflags)
 {
-        struct xfs_inode *ip = XFS_I(dentry->d_inode);
+        struct xfs_inode *ip = XFS_I(d_inode(dentry));
 
         if (strcmp(name, "") == 0)
                 return -EINVAL;
@@ -197,7 +197,7 @@ xfs_vn_listxattr(struct dentry *dentry, char *data, size_t size)
 {
         struct xfs_attr_list_context context;
         struct attrlist_cursor_kern cursor = { 0 };
-        struct inode            *inode = dentry->d_inode;
+        struct inode            *inode = d_inode(dentry);
         int                     error;
 
         /*