diff options
author | Nathan Scott <nathans@sgi.com> | 2006-06-09 03:00:52 -0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 03:00:52 -0400 |
commit | 67fcaa73adafb19139a7cd8ab133592b6a0a0901 (patch) | |
tree | 6e7b83e7c8b0a1d8b4776af1537d6f07ebe9435d /fs/xfs/xfs_rename.c | |
parent | b83bd1388133e914c38bd31d69bc90143e6ab10c (diff) |
[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 1f148762eb28..a20566b89121 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c | |||
@@ -226,7 +226,7 @@ int | |||
226 | xfs_rename( | 226 | xfs_rename( |
227 | bhv_desc_t *src_dir_bdp, | 227 | bhv_desc_t *src_dir_bdp, |
228 | vname_t *src_vname, | 228 | vname_t *src_vname, |
229 | vnode_t *target_dir_vp, | 229 | bhv_vnode_t *target_dir_vp, |
230 | vname_t *target_vname, | 230 | vname_t *target_vname, |
231 | cred_t *credp) | 231 | cred_t *credp) |
232 | { | 232 | { |
@@ -242,7 +242,7 @@ xfs_rename( | |||
242 | int committed; | 242 | int committed; |
243 | xfs_inode_t *inodes[4]; | 243 | xfs_inode_t *inodes[4]; |
244 | int target_ip_dropped = 0; /* dropped target_ip link? */ | 244 | int target_ip_dropped = 0; /* dropped target_ip link? */ |
245 | vnode_t *src_dir_vp; | 245 | bhv_vnode_t *src_dir_vp; |
246 | int spaceres; | 246 | int spaceres; |
247 | int target_link_zero = 0; | 247 | int target_link_zero = 0; |
248 | int num_inodes; | 248 | int num_inodes; |
@@ -609,7 +609,7 @@ xfs_rename( | |||
609 | * Let interposed file systems know about removed links. | 609 | * Let interposed file systems know about removed links. |
610 | */ | 610 | */ |
611 | if (target_ip_dropped) { | 611 | if (target_ip_dropped) { |
612 | VOP_LINK_REMOVED(XFS_ITOV(target_ip), target_dir_vp, | 612 | bhv_vop_link_removed(XFS_ITOV(target_ip), target_dir_vp, |
613 | target_link_zero); | 613 | target_link_zero); |
614 | IRELE(target_ip); | 614 | IRELE(target_ip); |
615 | } | 615 | } |