diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-09 10:48:30 +0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 10:48:30 +0400 |
| commit | b83bd1388133e914c38bd31d69bc90143e6ab10c (patch) | |
| tree | 3f7fecf3913d1aa8216e06f109746c63ec0ac501 /fs/xfs/linux-2.6/xfs_vnode.h | |
| parent | 932f2c323196c214e645d5a572a1d7b562c0f93f (diff) | |
| download | linux-b83bd1388133e914c38bd31d69bc90143e6ab10c.tar.xz | |
[XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters.
SGI-PV: 9533338
SGI-Modid: xfs-linux-melb:xfs-kern:26106a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_vnode.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index 569a4e7b5cc1..95343637ab66 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h @@ -68,7 +68,7 @@ typedef enum vflags { */ typedef struct vnode { vflags_t v_flag; /* vnode flags (see above) */ - struct vfs *v_vfsp; /* ptr to containing VFS */ + struct bhv_vfs *v_vfsp; /* ptr to containing VFS */ vnumber_t v_number; /* in-core vnode number */ vn_bhv_head_t v_bh; /* behavior head */ spinlock_t v_lock; /* VN_LOCK/VN_UNLOCK */ @@ -503,7 +503,7 @@ extern vnode_t *vn_initialize(struct inode *); * vnode_map structures _must_ match vn_epoch and vnode structure sizes. */ typedef struct vnode_map { - vfs_t *v_vfsp; + bhv_vfs_t *v_vfsp; vnumber_t v_number; /* in-core vnode number */ xfs_ino_t v_ino; /* inode # */ } vmap_t; |