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/linux-2.6/xfs_vfs.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/linux-2.6/xfs_vfs.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c index 9f9bc894deb9..a91ecfa9c8aa 100644 --- a/fs/xfs/linux-2.6/xfs_vfs.c +++ b/fs/xfs/linux-2.6/xfs_vfs.c | |||
@@ -104,7 +104,7 @@ vfs_mntupdate( | |||
104 | int | 104 | int |
105 | vfs_root( | 105 | vfs_root( |
106 | struct bhv_desc *bdp, | 106 | struct bhv_desc *bdp, |
107 | struct vnode **vpp) | 107 | struct bhv_vnode **vpp) |
108 | { | 108 | { |
109 | struct bhv_desc *next = bdp; | 109 | struct bhv_desc *next = bdp; |
110 | 110 | ||
@@ -118,7 +118,7 @@ int | |||
118 | vfs_statvfs( | 118 | vfs_statvfs( |
119 | struct bhv_desc *bdp, | 119 | struct bhv_desc *bdp, |
120 | xfs_statfs_t *sp, | 120 | xfs_statfs_t *sp, |
121 | struct vnode *vp) | 121 | struct bhv_vnode *vp) |
122 | { | 122 | { |
123 | struct bhv_desc *next = bdp; | 123 | struct bhv_desc *next = bdp; |
124 | 124 | ||
@@ -145,7 +145,7 @@ vfs_sync( | |||
145 | int | 145 | int |
146 | vfs_vget( | 146 | vfs_vget( |
147 | struct bhv_desc *bdp, | 147 | struct bhv_desc *bdp, |
148 | struct vnode **vpp, | 148 | struct bhv_vnode **vpp, |
149 | struct fid *fidp) | 149 | struct fid *fidp) |
150 | { | 150 | { |
151 | struct bhv_desc *next = bdp; | 151 | struct bhv_desc *next = bdp; |
@@ -187,7 +187,7 @@ vfs_quotactl( | |||
187 | void | 187 | void |
188 | vfs_init_vnode( | 188 | vfs_init_vnode( |
189 | struct bhv_desc *bdp, | 189 | struct bhv_desc *bdp, |
190 | struct vnode *vp, | 190 | struct bhv_vnode *vp, |
191 | struct bhv_desc *bp, | 191 | struct bhv_desc *bp, |
192 | int unlock) | 192 | int unlock) |
193 | { | 193 | { |