Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc64005c authored by Al Viro's avatar Al Viro
Browse files

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



... and neither can ever be NULL

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 04c57f45

fs/9p/vfs_inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1071,7 +1071,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
	if (IS_ERR(st))

	if (IS_ERR(st))

		return PTR_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);

	generic_fillattr(d_inode(dentry), stat);





	p9stat_free(st);

	p9stat_free(st);

fs/btrfs/tree-log.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -4851,7 +4851,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans, 
			goto out;

			goto out;





	if (!S_ISDIR(inode->i_mode)) {

	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;

			goto out;

		inode = d_inode(parent);

		inode = d_inode(parent);

	}

	}
@@ -4872,7 +4872,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans, 
			break;

			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;

			break;





		if (IS_ROOT(parent))

		if (IS_ROOT(parent))
@@ -5285,7 +5285,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, 
	}

	}





	while (1) {

	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;

			break;





		inode = d_inode(parent);

		inode = d_inode(parent);

fs/cifs/cifs_dfs_ref.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -302,7 +302,7 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	if (full_path == NULL)

	if (full_path == NULL)

		goto cdda_exit;

		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);

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

	if (IS_ERR(tlink)) {

		mnt = ERR_CAST(tlink);

		mnt = ERR_CAST(tlink);

fs/cifs/inode.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2418,8 +2418,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) 
int

int

cifs_setattr(struct dentry *direntry, struct iattr *attrs)

cifs_setattr(struct dentry *direntry, struct iattr *attrs)

{

{

	struct inode *inode = d_inode(direntry);

	struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb);

	struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb);





	if (pTcon->unix_ext)

	if (pTcon->unix_ext)

fs/cifs/readdir.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name, 
{

{

	struct dentry *dentry, *alias;

	struct dentry *dentry, *alias;

	struct inode *inode;

	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);

	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);





	cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);

	cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);