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

[XFS] cleanup vnode use in xfs_symlink and xfs_rename

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

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:19 +11:00
committed by Lachlan McIlroy
parent a3da789640
commit 3937be5ba8
4 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/xfs/xfs_vnodeops.c
View File

@@ -3059,10 +3059,9 @@ xfs_symlink(
bhv_vname_t *dentry,
char *target_path,
mode_t mode,
bhv_vnode_t **vpp,
xfs_inode_t **ipp,
cred_t *credp)
{
bhv_vnode_t *dir_vp = XFS_ITOV(dp);
xfs_mount_t *mp = dp->i_mount;
xfs_trans_t *tp;
xfs_inode_t *ip;
@@ -3088,7 +3087,7 @@ xfs_symlink(
char *link_name = VNAME(dentry);
int link_namelen;
*vpp = NULL;
*ipp = NULL;
error = 0;
ip = NULL;
tp = NULL;
@@ -3227,7 +3226,7 @@ xfs_symlink(
* transaction cancel unlocking dp so don't do it explicitly in the
* error path.
*/
VN_HOLD(dir_vp);
IHOLD(dp);
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
unlock_dp_on_error = B_FALSE;
@@ -3343,13 +3342,8 @@ std_return:
0, error, 0);
}
if (!error) {
bhv_vnode_t *vp;
ASSERT(ip);
vp = XFS_ITOV(ip);
*vpp = vp;
}
if (!error)
*ipp = ip;
return error;
error2: