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_utils.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_utils.c')
-rw-r--r-- | fs/xfs/xfs_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 34654ec6ae10..6ecc0ca58681 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
@@ -54,7 +54,7 @@ xfs_get_dir_entry( | |||
54 | vname_t *dentry, | 54 | vname_t *dentry, |
55 | xfs_inode_t **ipp) | 55 | xfs_inode_t **ipp) |
56 | { | 56 | { |
57 | vnode_t *vp; | 57 | bhv_vnode_t *vp; |
58 | 58 | ||
59 | vp = VNAME_TO_VNODE(dentry); | 59 | vp = VNAME_TO_VNODE(dentry); |
60 | 60 | ||
@@ -73,7 +73,7 @@ xfs_dir_lookup_int( | |||
73 | xfs_ino_t *inum, | 73 | xfs_ino_t *inum, |
74 | xfs_inode_t **ipp) | 74 | xfs_inode_t **ipp) |
75 | { | 75 | { |
76 | vnode_t *dir_vp; | 76 | bhv_vnode_t *dir_vp; |
77 | xfs_inode_t *dp; | 77 | xfs_inode_t *dp; |
78 | int error; | 78 | int error; |
79 | 79 | ||