[PATCH 1/5] kill vn_from_inode

[PATCH 1/5] kill vn_from_inode

[Christoph Hellwig]

bhv_vnode_t is just a typedef for struct inode, so there's no need for
a helper to convert between the two.


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_super.c	2008-07-23 19:29:16.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c	2008-07-23 19:29:22.000000000 +0200
@@ -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
Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vnode.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_vnode.h	2008-07-23 19:29:26.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vnode.h	2008-07-23 19:29:52.000000000 +0200
@@ -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));
 }
 
 /*

Re: [PATCH 1/5] kill vn_from_inode

[Lachlan McIlroy]

Yep, good stuff.

Christoph Hellwig wrote:
> bhv_vnode_t is just a typedef for struct inode, so there's no need for
> a helper to convert between the two.
> 
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_super.c	2008-07-23 19:29:16.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c	2008-07-23 19:29:22.000000000 +0200
> @@ -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
> Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vnode.h
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_vnode.h	2008-07-23 19:29:26.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vnode.h	2008-07-23 19:29:52.000000000 +0200
> @@ -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));
>  }
>  
>  /*
> 
> 
>