lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] cleanup vnode use in xfs_link

Browse Source 
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30547a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Christoph Hellwig
2008-03-06 13:46:12 +11:00
committed by Lachlan McIlroy
parent 979ebab116
commit a3da789640
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/xfs/xfs_vnodeops.c
View File

@@ -2471,12 +2471,10 @@ xfs_remove(
int
xfs_link(
xfs_inode_t *tdp,
bhv_vnode_t *src_vp,
xfs_inode_t *sip,
bhv_vname_t *dentry)
{
bhv_vnode_t *target_dir_vp = XFS_ITOV(tdp);
xfs_mount_t *mp = tdp->i_mount;
xfs_inode_t *sip = xfs_vtoi(src_vp);
xfs_trans_t *tp;
xfs_inode_t *ips[2];
int error;
@@ -2489,10 +2487,10 @@ xfs_link(
int target_namelen;
xfs_itrace_entry(tdp);
xfs_itrace_entry(xfs_vtoi(src_vp));
xfs_itrace_entry(sip);
target_namelen = VNAMELEN(dentry);
ASSERT(!VN_ISDIR(src_vp));
ASSERT(!S_ISDIR(sip->i_d.di_mode));
if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO);
@@ -2544,8 +2542,8 @@ xfs_link(
* xfs_trans_cancel will both unlock the inodes and
* decrement the associated ref counts.
*/
VN_HOLD(src_vp);
VN_HOLD(target_dir_vp);
IHOLD(sip);
IHOLD(tdp);
xfs_trans_ijoin(tp, sip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, tdp, XFS_ILOCK_EXCL);