Skip to content

Commit

Permalink
[XFS] remove remaining VN_HOLD calls
Browse files Browse the repository at this point in the history
Use IHOLD(ip) instead of VN_HOLD(VFS_I(ip)).

SGI-PV: 981498

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

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
  • Loading branch information
Christoph Hellwig authored and Lachlan McIlroy committed Aug 13, 2008
1 parent 604323c commit 0b1f917
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion fs/xfs/quota/xfs_dquot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_bmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 3 additions & 7 deletions fs/xfs/xfs_dfrag.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0b1f917

Please sign in to comment.