aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-08-13 16:11:26 +1000
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-08-13 16:11:26 +1000
commita19d033cd2cc66120f01b370ec081d67b59b7924 (patch)
tree8301461c9fb6a662abaccbfc277136a82752f8d1 /fs/xfs
parent39dab9d7daf5f664a3569378107a2cb284c8a594 (diff)
[XFS] Remove vn_from_inode()
bhv_vnode_t is just a typedef for struct inode, so there's no need for a helper to convert between the two. SGI-PV: 981498 SGI-Modid: xfs-linux-melb:xfs-kern:31760a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_vnode.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 27758409fc8..184ef14856a 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -994,7 +994,7 @@ STATIC void
xfs_fs_destroy_inode(
struct inode *inode)
{
- kmem_zone_free(xfs_vnode_zone, vn_from_inode(inode));
+ kmem_zone_free(xfs_vnode_zone, inode);
}
STATIC void
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index c3afecf8c5b..536515cad90 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -27,10 +27,6 @@ typedef struct inode bhv_vnode_t;
/*
* Vnode to Linux inode mapping.
*/
-static inline bhv_vnode_t *vn_from_inode(struct inode *inode)
-{
- return inode;
-}
static inline struct inode *vn_to_inode(bhv_vnode_t *vnode)
{
return vnode;
@@ -100,8 +96,7 @@ extern bhv_vnode_t *vn_hold(bhv_vnode_t *);
static inline bhv_vnode_t *vn_grab(bhv_vnode_t *vp)
{
- struct inode *inode = igrab(vn_to_inode(vp));
- return inode ? vn_from_inode(inode) : NULL;
+ return igrab(vn_to_inode(vp));
}
/*