diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-09 17:00:52 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 17:00:52 +1000 |
| commit | 67fcaa73adafb19139a7cd8ab133592b6a0a0901 (patch) | |
| tree | 6e7b83e7c8b0a1d8b4776af1537d6f07ebe9435d /fs/xfs/xfs_rename.c | |
| parent | b83bd1388133e914c38bd31d69bc90143e6ab10c (diff) | |
| download | kernel_samsung_smdk4412-67fcaa73adafb19139a7cd8ab133592b6a0a0901.zip kernel_samsung_smdk4412-67fcaa73adafb19139a7cd8ab133592b6a0a0901.tar.gz kernel_samsung_smdk4412-67fcaa73adafb19139a7cd8ab133592b6a0a0901.tar.bz2 | |
[XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters.
SGI-PV: 953338
SGI-Modid: xfs-linux-melb:xfs-kern:26107a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_rename.c')
| -rw-r--r-- | fs/xfs/xfs_rename.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index 1f14876..a20566b 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c @@ -226,7 +226,7 @@ int xfs_rename( bhv_desc_t *src_dir_bdp, vname_t *src_vname, - vnode_t *target_dir_vp, + bhv_vnode_t *target_dir_vp, vname_t *target_vname, cred_t *credp) { @@ -242,7 +242,7 @@ xfs_rename( int committed; xfs_inode_t *inodes[4]; int target_ip_dropped = 0; /* dropped target_ip link? */ - vnode_t *src_dir_vp; + bhv_vnode_t *src_dir_vp; int spaceres; int target_link_zero = 0; int num_inodes; @@ -609,7 +609,7 @@ xfs_rename( * Let interposed file systems know about removed links. */ if (target_ip_dropped) { - VOP_LINK_REMOVED(XFS_ITOV(target_ip), target_dir_vp, + bhv_vop_link_removed(XFS_ITOV(target_ip), target_dir_vp, target_link_zero); IRELE(target_ip); } |