kill the v_number member in struct bhv_vnode

PATCH In review Christoph Hellwig 1 participant 1 message Aug 23, 2007 XFS filesystem

lore

Share & tools

lore

Christoph Hellwig

author

2007-08-23 19:39 UTC #0 lore raw

PATCH 7/17 kill the v_number member in struct bhv_vnode

It's entirely unused except for ignored arguments in the mrlock initialization, so remove it.

Note that Dave wanted to keep it last time I posted this, but there is no chance for that as struct bhv_vnode is going away. If you really need it I offer to write a patch that adds a debug-only i_sequence to struct xfs_inode when needed.

Signed-off-by Christoph Hellwig <[email protected]>

fs/xfs/linux-2.6/xfs_vnode.c +0 -8

Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vnode.c
===================================================================
@@ -31,8 +31,6 @@
 #include "xfs_ag.h"
 #include "xfs_mount.h"
 
-uint64_t vn_generation;		/* vnode generation number */
-DEFINE_SPINLOCK(vnumber_lock);
 
 /*
  * Dedicated vnode inactive/reclaim sync semaphores.

@@ -95,12 +93,6 @@ vn_initialize(
 	XFS_STATS_INC(vn_active);
 	XFS_STATS_INC(vn_alloc);
 
-	spin_lock(&vnumber_lock);
-	if (!++vn_generation)	/* v_number shouldn't be zero */
-		vn_generation++;
-	vp->v_number = vn_generation;
-	spin_unlock(&vnumber_lock);
-
 	ASSERT(VN_CACHED(vp) == 0);
 
 	return vp;

fs/xfs/linux-2.6/xfs_vnode.h +0 -1

Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_vnode.h
===================================================================
@@ -28,7 +28,6 @@ typedef struct dentry	bhv_vname_t;
 typedef __u64		bhv_vnumber_t;
 
 typedef struct bhv_vnode {
-	bhv_vnumber_t	v_number;		/* in-core vnode number */
 	struct inode	v_inode;		/* Linux inode */
 	/* inode MUST be last */
 } bhv_vnode_t;

fs/xfs/xfs_iget.c +2 -2

Index: linux-2.6-xfs/fs/xfs/xfs_iget.c
===================================================================
@@ -431,8 +431,8 @@ xfs_inode_lock_init(
 	bhv_vnode_t	*vp)
 {
 	mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER,
-		     "xfsino", (long)vp->v_number);
-	mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", vp->v_number);
+		     "xfsino", ip->i_ino);
+	mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino);
 	init_waitqueue_head(&ip->i_ipin_wait);
 	atomic_set(&ip->i_pincount, 0);
 	initnsema(&ip->i_flock, 1, "xfsfino");

fs/xfs/xfsidbg.c +0 -3

Index: linux-2.6-xfs/fs/xfs/xfsidbg.c
===================================================================
@@ -1780,10 +1780,7 @@ static void printbhv(bhv_desc_t *bdp)
 static void	printvnode(bhv_vnode_t *vp, unsigned long addr)
 {
 	kdb_printf("vnode: 0x%lx\n", addr);
-
 	kdb_printf("\n");
-
-	kdb_printf("   v_number 0x%llx\n", (unsigned long long)vp->v_number);
 }
 
 static int	kdbm_vnode(