diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-09 17:07:12 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 17:07:12 +1000 |
| commit | 8285fb58e75bfdb447c7a2c533ec9efdb238f966 (patch) | |
| tree | 4bcfa74d3328ff5d71437556d24019be98c1d9fa /fs/xfs/xfs_rename.c | |
| parent | 67fcaa73adafb19139a7cd8ab133592b6a0a0901 (diff) | |
| download | kernel-common-8285fb58e75bfdb447c7a2c533ec9efdb238f966.tar.gz kernel-common-8285fb58e75bfdb447c7a2c533ec9efdb238f966.tar.bz2 kernel-common-8285fb58e75bfdb447c7a2c533ec9efdb238f966.zip | |
[XFS] Resolve a namespace collision on remaining vtypes for FreeBSD
porters.
SGI-PV: 953338
SGI-Modid: xfs-linux-melb:xfs-kern:26108a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_rename.c')
| -rw-r--r-- | fs/xfs/xfs_rename.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index a20566b89121..7d5f9b6ffdb8 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c @@ -87,8 +87,8 @@ STATIC int xfs_lock_for_rename( xfs_inode_t *dp1, /* old (source) directory inode */ xfs_inode_t *dp2, /* new (target) directory inode */ - vname_t *vname1,/* old entry name */ - vname_t *vname2,/* new entry name */ + bhv_vname_t *vname1,/* old entry name */ + bhv_vname_t *vname2,/* new entry name */ xfs_inode_t **ipp1, /* inode of old entry */ xfs_inode_t **ipp2, /* inode of new entry, if it already exists, NULL otherwise. */ @@ -225,9 +225,9 @@ xfs_lock_for_rename( int xfs_rename( bhv_desc_t *src_dir_bdp, - vname_t *src_vname, + bhv_vname_t *src_vname, bhv_vnode_t *target_dir_vp, - vname_t *target_vname, + bhv_vname_t *target_vname, cred_t *credp) { xfs_trans_t *tp; |