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

Commit 0b1f9177 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] remove remaining VN_HOLD calls 



Use IHOLD(ip) instead of VN_HOLD(VFS_I(ip)).

SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31765a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 604323ca

fs/xfs/quota/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ xfs_qm_dqalloc( 
	 * when it unlocks the inode. Since we want to keep the quota

	 * inode around, we bump the vnode ref count now.

	 */

	VN_HOLD(VFS_I(quotip));

	IHOLD(quotip);



	xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);

	nmaps = 1;

fs/xfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -4000,7 +4000,7 @@ xfs_bmap_add_attrfork( 
		ip->i_d.di_aformat = XFS_DINODE_FMT_EXTENTS;

	}

	ASSERT(ip->i_d.di_anextents == 0);

	VN_HOLD(VFS_I(ip));

	IHOLD(ip);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	switch (ip->i_d.di_format) {

fs/xfs/xfs_dfrag.c

+3 −7
Original line number Diff line number Diff line
@@ -350,15 +350,11 @@ xfs_swap_extents( 
		break;

	}



	/*

	 * Increment vnode ref counts since xfs_trans_commit &

	 * xfs_trans_cancel will both unlock the inodes and

	 * decrement the associated ref counts.

	 */

	VN_HOLD(vp);

	VN_HOLD(tvp);



	IHOLD(ip);

	xfs_trans_ijoin(tp, ip, lock_flags);



	IHOLD(tip);

	xfs_trans_ijoin(tp, tip, lock_flags);



	xfs_trans_log_inode(tp, ip,  ilf_fields);