diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 17:10:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 17:10:34 (GMT) |
| commit | 9f5974c8734d83d4ab7096ed98136a82f41210d6 (patch) | |
| tree | 6f328555796bafefb74936ab68128aa84efd28b1 /fs/xfs/xfs_rename.c | |
| parent | a2d823bf13efea4c859376f6e85c49cfbad7ab60 (diff) | |
| parent | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (diff) | |
| download | linux-9f5974c8734d83d4ab7096ed98136a82f41210d6.tar.xz | |
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
Diffstat (limited to 'fs/xfs/xfs_rename.c')
| -rw-r--r-- | fs/xfs/xfs_rename.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index 4d4e8f4..81a05cf 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c @@ -243,7 +243,6 @@ xfs_rename( xfs_inode_t *inodes[4]; int target_ip_dropped = 0; /* dropped target_ip link? */ vnode_t *src_dir_vp; - bhv_desc_t *target_dir_bdp; int spaceres; int target_link_zero = 0; int num_inodes; @@ -260,14 +259,12 @@ xfs_rename( * Find the XFS behavior descriptor for the target directory * vnode since it was not handed to us. */ - target_dir_bdp = vn_bhv_lookup_unlocked(VN_BHV_HEAD(target_dir_vp), - &xfs_vnodeops); - if (target_dir_bdp == NULL) { + target_dp = xfs_vtoi(target_dir_vp); + if (target_dp == NULL) { return XFS_ERROR(EXDEV); } src_dp = XFS_BHVTOI(src_dir_bdp); - target_dp = XFS_BHVTOI(target_dir_bdp); mp = src_dp->i_mount; if (DM_EVENT_ENABLED(src_dir_vp->v_vfsp, src_dp, DM_EVENT_RENAME) || |