[XFS] Remove vn_from_inode()

[linux-2.6-omap-h63xx.git] / fs / xfs / linux-2.6 / xfs_vnode.h

diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index 41ca2cec5d310da74c6b285c8cec9783e3b9e797..536515cad90e3f6cdf01616a8493f7c62ea349d5 100644 (file)
--- 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;
@@ -89,9 +85,9 @@ extern bhv_vnode_t    *vn_hold(bhv_vnode_t *);
 #if defined(XFS_INODE_TRACE)
 #define VN_HOLD(vp)            \
        ((void)vn_hold(vp),     \
-         xfs_itrace_hold(xfs_vtoi(vp), __FILE__, __LINE__, (inst_t *)__return_address))
+         xfs_itrace_hold(XFS_I(vp), __FILE__, __LINE__, (inst_t *)__return_address))
 #define VN_RELE(vp)            \
-         (xfs_itrace_rele(xfs_vtoi(vp), __FILE__, __LINE__, (inst_t *)__return_address), \
+         (xfs_itrace_rele(XFS_I(vp), __FILE__, __LINE__, (inst_t *)__return_address), \
           iput(vn_to_inode(vp)))
 #else
 #define VN_HOLD(vp)            ((void)vn_hold(vp))
@@ -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));
 }
 
 /*