don't bother with ->d_inode->i_sb - it's always equal to ->d_sb

... and neither can ever be NULL

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

25 files changed, 33 insertions, 42 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 3a08b3e6ff1d..f4645c515262 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1071,7 +1071,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
         if (IS_ERR(st))
                 return PTR_ERR(st);
 
-        v9fs_stat2inode(st, d_inode(dentry), d_inode(dentry)->i_sb);
+        v9fs_stat2inode(st, d_inode(dentry), dentry->d_sb);
         generic_fillattr(d_inode(dentry), stat);
 
         p9stat_free(st);
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 24d03c751149..a82e20ecbee1 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4851,7 +4851,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
                         goto out;
 
         if (!S_ISDIR(inode->i_mode)) {
-                if (!parent || d_really_is_negative(parent) || sb != d_inode(parent)->i_sb)
+                if (!parent || d_really_is_negative(parent) || sb != parent->d_sb)
                         goto out;
                 inode = d_inode(parent);
         }
@@ -4872,7 +4872,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
                         break;
                 }
 
-                if (!parent || d_really_is_negative(parent) || sb != d_inode(parent)->i_sb)
+                if (!parent || d_really_is_negative(parent) || sb != parent->d_sb)
                         break;
 
                 if (IS_ROOT(parent))
@@ -5285,7 +5285,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
         }
 
         while (1) {
-                if (!parent || d_really_is_negative(parent) || sb != d_inode(parent)->i_sb)
+                if (!parent || d_really_is_negative(parent) || sb != parent->d_sb)
                         break;
 
                 inode = d_inode(parent);
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index e956cba94338..94f2c8a9ae6d 100644
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -302,7 +302,7 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt)
         if (full_path == NULL)
                 goto cdda_exit;
 
-        cifs_sb = CIFS_SB(d_inode(mntpt)->i_sb);
+        cifs_sb = CIFS_SB(mntpt->d_sb);
         tlink = cifs_sb_tlink(cifs_sb);
         if (IS_ERR(tlink)) {
                 mnt = ERR_CAST(tlink);
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index aeb26dbfa1bf..4cd4705ebfad 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -2418,8 +2418,7 @@ cifs_setattr_exit:
 int
 cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 {
-        struct inode *inode = d_inode(direntry);
-        struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
+        struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);
         struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb);
 
         if (pTcon->unix_ext)
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index b30a4a6d98a0..4cfb4d9f88e2 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -78,7 +78,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
 {
         struct dentry *dentry, *alias;
         struct inode *inode;
-        struct super_block *sb = d_inode(parent)->i_sb;
+        struct super_block *sb = parent->d_sb;
         struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
 
         cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index f5dc2f0df4ad..612de933431f 100644
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -52,9 +52,7 @@ int cifs_removexattr(struct dentry *direntry, const char *ea_name)
                 return -EIO;
         if (d_really_is_negative(direntry))
                 return -EIO;
-        sb = d_inode(direntry)->i_sb;
-        if (sb == NULL)
-                return -EIO;
+        sb = direntry->d_sb;
 
         cifs_sb = CIFS_SB(sb);
         tlink = cifs_sb_tlink(cifs_sb);
@@ -113,9 +111,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                 return -EIO;
         if (d_really_is_negative(direntry))
                 return -EIO;
-        sb = d_inode(direntry)->i_sb;
-        if (sb == NULL)
-                return -EIO;
+        sb = direntry->d_sb;
 
         cifs_sb = CIFS_SB(sb);
         tlink = cifs_sb_tlink(cifs_sb);
@@ -248,9 +244,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                 return -EIO;
         if (d_really_is_negative(direntry))
                 return -EIO;
-        sb = d_inode(direntry)->i_sb;
-        if (sb == NULL)
-                return -EIO;
+        sb = direntry->d_sb;
 
         cifs_sb = CIFS_SB(sb);
         tlink = cifs_sb_tlink(cifs_sb);
@@ -384,9 +378,7 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size)
                 return -EIO;
         if (d_really_is_negative(direntry))
                 return -EIO;
-        sb = d_inode(direntry)->i_sb;
-        if (sb == NULL)
-                return -EIO;
+        sb = direntry->d_sb;
 
         cifs_sb = CIFS_SB(sb);
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index 40ba9cc41bf7..d34a40edcdb2 100644
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -113,7 +113,7 @@ struct dentry *efs_get_parent(struct dentry *child)
 
         ino = efs_find_entry(d_inode(child), "..", 2);
         if (ino)
-                parent = d_obtain_alias(efs_iget(d_inode(child)->i_sb, ino));
+                parent = d_obtain_alias(efs_iget(child->d_sb, ino));
 
         return parent;
 }
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 6658a50530a0..192373653dfb 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -958,7 +958,7 @@ static struct dentry *exofs_get_parent(struct dentry *child)
         if (!ino)
                 return ERR_PTR(-ESTALE);
 
-        return d_obtain_alias(exofs_iget(d_inode(child)->i_sb, ino));
+        return d_obtain_alias(exofs_iget(child->d_sb, ino));
 }
 
 static struct inode *exofs_nfs_get_inode(struct super_block *sb,
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 7a2be8f7f3c3..1a7eb49a115d 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -82,7 +82,7 @@ struct dentry *ext2_get_parent(struct dentry *child)
         unsigned long ino = ext2_inode_by_name(d_inode(child), &dotdot);
         if (!ino)
                 return ERR_PTR(-ENOENT);
-        return d_obtain_alias(ext2_iget(d_inode(child)->i_sb, ino));
+        return d_obtain_alias(ext2_iget(child->d_sb, ino));
 } 
 
 /*
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 48e4b8907826..5611ec9348d7 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1638,13 +1638,13 @@ struct dentry *ext4_get_parent(struct dentry *child)
         ino = le32_to_cpu(de->inode);
         brelse(bh);
 
-        if (!ext4_valid_inum(d_inode(child)->i_sb, ino)) {
+        if (!ext4_valid_inum(child->d_sb, ino)) {
                 EXT4_ERROR_INODE(d_inode(child),
                                  "bad parent inode number: %u", ino);
                 return ERR_PTR(-EFSCORRUPTED);
         }
 
-        return d_obtain_alias(ext4_iget_normal(d_inode(child)->i_sb, ino));
+        return d_obtain_alias(ext4_iget_normal(child->d_sb, ino));
 }
 
 /*
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 7876f1052101..db874ad3514a 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -202,7 +202,7 @@ struct dentry *f2fs_get_parent(struct dentry *child)
         unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot);
         if (!ino)
                 return ERR_PTR(-ENOENT);
-        return d_obtain_alias(f2fs_iget(d_inode(child)->i_sb, ino));
+        return d_obtain_alias(f2fs_iget(child->d_sb, ino));
 }
 
 static int __recover_dot_dentries(struct inode *dir, nid_t pino)
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 49b0bff18fe3..c09c63dcd7a2 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1360,7 +1360,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type,
                 return ERR_PTR(error);
         }
         s = sget(&gfs2_fs_type, test_gfs2_super, set_meta_super, flags,
-                 d_inode(path.dentry)->i_sb->s_bdev);
+                 path.dentry->d_sb->s_bdev);
         path_put(&path);
         if (IS_ERR(s)) {
                 pr_warn("gfs2 mount does not exist\n");
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index f8a0cd821290..9b2ff353e45f 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1176,7 +1176,7 @@ static int gfs2_statfs_i(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *s
 
 static int gfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
-        struct super_block *sb = d_inode(dentry)->i_sb;
+        struct super_block *sb = dentry->d_sb;
         struct gfs2_sbd *sdp = sb->s_fs_info;
         struct gfs2_statfs_change_host sc;
         int error;
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 30c4c9ebb693..7a9579e03dbb 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -241,7 +241,7 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
 
 static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct dentry *dentry)
 {
-        struct jffs2_sb_info *c = JFFS2_SB_INFO(d_inode(old_dentry)->i_sb);
+        struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dentry->d_sb);
         struct jffs2_inode_info *f = JFFS2_INODE_INFO(d_inode(old_dentry));
         struct jffs2_inode_info *dir_f = JFFS2_INODE_INFO(dir_i);
         int ret;
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 0a9a114bb9d1..5ef21f4c4c77 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -147,7 +147,7 @@ static struct dentry *jffs2_get_parent(struct dentry *child)
         JFFS2_DEBUG("Parent of directory ino #%u is #%u\n",
                     f->inocache->ino, pino);
 
-        return d_obtain_alias(jffs2_iget(d_inode(child)->i_sb, pino));
+        return d_obtain_alias(jffs2_iget(child->d_sb, pino));
 }
 
 static const struct export_operations jffs2_export_ops = {
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 701f89370de7..8a40941ac9a6 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1524,7 +1524,7 @@ struct dentry *jfs_get_parent(struct dentry *dentry)
         parent_ino =
                 le32_to_cpu(JFS_IP(d_inode(dentry))->i_dtroot.header.idotdot);
 
-        return d_obtain_alias(jfs_iget(d_inode(dentry)->i_sb, parent_ino));
+        return d_obtain_alias(jfs_iget(dentry->d_sb, parent_ino));
 }
 
 const struct inode_operations jfs_dir_inode_operations = {
diff --git a/fs/namei.c b/fs/namei.c
index 3498d53de26f..c0d551fc43a0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2653,7 +2653,7 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)
                 return NULL;
         }
 
-        mutex_lock(&p1->d_inode->i_sb->s_vfs_rename_mutex);
+        mutex_lock(&p1->d_sb->s_vfs_rename_mutex);
 
         p = d_ancestor(p2, p1);
         if (p) {
@@ -2680,7 +2680,7 @@ void unlock_rename(struct dentry *p1, struct dentry *p2)
         inode_unlock(p1->d_inode);
         if (p1 != p2) {
                 inode_unlock(p2->d_inode);
-                mutex_unlock(&p1->d_inode->i_sb->s_vfs_rename_mutex);
+                mutex_unlock(&p1->d_sb->s_vfs_rename_mutex);
         }
 }
 EXPORT_SYMBOL(unlock_rename);
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 7a0cfd3266e5..e5daa932b823 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -396,7 +396,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq, bool write)
 static void nfs_direct_readpage_release(struct nfs_page *req)
 {
         dprintk("NFS: direct read done (%s/%llu %d@%lld)\n",
-                d_inode(req->wb_context->dentry)->i_sb->s_id,
+                req->wb_context->dentry->d_sb->s_id,
                 (unsigned long long)NFS_FILEID(d_inode(req->wb_context->dentry)),
                 req->wb_bytes,
                 (long long)req_offset(req));
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 51c3b06e8036..d818e4ffd79f 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -552,7 +552,7 @@ nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle    *argp,
          * different read/write sizes for file systems known to have
          * problems with large blocks */
         if (nfserr == 0) {
-                struct super_block *sb = d_inode(argp->fh.fh_dentry)->i_sb;
+                struct super_block *sb = argp->fh.fh_dentry->d_sb;
 
                 /* Note that we don't care for remote fs's here */
                 if (sb->s_magic == MSDOS_SUPER_MAGIC) {
@@ -588,7 +588,7 @@ nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle      *argp,
         nfserr = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP);
 
         if (nfserr == 0) {
-                struct super_block *sb = d_inode(argp->fh.fh_dentry)->i_sb;
+                struct super_block *sb = argp->fh.fh_dentry->d_sb;
 
                 /* Note that we don't care for remote fs's here */
                 switch (sb->s_magic) {
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 2246454dec76..93d5853f8c99 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -146,7 +146,7 @@ static __be32 *encode_fsid(__be32 *p, struct svc_fh *fhp)
         default:
         case FSIDSOURCE_DEV:
                 p = xdr_encode_hyper(p, (u64)huge_encode_dev
-                                     (d_inode(fhp->fh_dentry)->i_sb->s_dev));
+                                     (fhp->fh_dentry->d_sb->s_dev));
                 break;
         case FSIDSOURCE_FSID:
                 p = xdr_encode_hyper(p, (u64) fhp->fh_export->ex_fsid);
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index c1681ce894c5..a8919444c460 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -426,7 +426,7 @@ static bool is_root_export(struct svc_export *exp)
 
 static struct super_block *exp_sb(struct svc_export *exp)
 {
-        return d_inode(exp->ex_path.dentry)->i_sb;
+        return exp->ex_path.dentry->d_sb;
 }
 
 static bool fsid_type_ok_for_exp(u8 fsid_type, struct svc_export *exp)
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index 7ccdb961eea9..38d67f3e25bc 100644
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -457,7 +457,7 @@ static struct dentry *nilfs_get_parent(struct dentry *child)
 
         root = NILFS_I(d_inode(child))->i_root;
 
-        inode = nilfs_iget(d_inode(child)->i_sb, root, ino);
+        inode = nilfs_iget(child->d_sb, root, ino);
         if (IS_ERR(inode))
                 return ERR_CAST(inode);
 
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index c18ab45f8d21..c6fdcbd46bba 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1290,7 +1290,7 @@ int ocfs2_getattr(struct vfsmount *mnt,
                   struct kstat *stat)
 {
         struct inode *inode = d_inode(dentry);
-        struct super_block *sb = d_inode(dentry)->i_sb;
+        struct super_block *sb = dentry->d_sb;
         struct ocfs2_super *osb = sb->s_fs_info;
         int err;
 
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index a2ba11eca995..c3e5c9679371 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -1250,7 +1250,7 @@ static struct dentry *udf_get_parent(struct dentry *child)
         brelse(fibh.sbh);
 
         tloc = lelb_to_cpu(cfi.icb.extLocation);
-        inode = udf_iget(d_inode(child)->i_sb, &tloc);
+        inode = udf_iget(child->d_sb, &tloc);
         if (IS_ERR(inode))
                 return ERR_CAST(inode);
 
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 442fd52ebffe..f04ab232d08d 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -132,7 +132,7 @@ static struct dentry *ufs_get_parent(struct dentry *child)
         ino = ufs_inode_by_name(d_inode(child), &dot_dot);
         if (!ino)
                 return ERR_PTR(-ENOENT);
-        return d_obtain_alias(ufs_iget(d_inode(child)->i_sb, ino));
+        return d_obtain_alias(ufs_iget(child->d_sb, ino));
 }
 
 static const struct export_operations ufs_export_ops = {