leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XFS] kill the v_number member in struct bhv_vnode

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

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29499a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Christoph Hellwig 2007-08-29 11:46:57 +10:00 committed by Tim Shimmin
parent 1543d79c45
commit 2aeaa258c0
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/xfs/linux-2.6/xfs_vnode.c
View File

@ -31,8 +31,6 @@
#include "xfs_ag.h" #include "xfs_ag.h"
#include "xfs_mount.h" #include "xfs_mount.h"
uint64_t vn_generation; /* vnode generation number */
DEFINE_SPINLOCK(vnumber_lock);
/* /*
* Dedicated vnode inactive/reclaim sync semaphores. * Dedicated vnode inactive/reclaim sync semaphores.
@ -95,12 +93,6 @@ vn_initialize(
XFS_STATS_INC(vn_active); XFS_STATS_INC(vn_active);
XFS_STATS_INC(vn_alloc); 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); ASSERT(VN_CACHED(vp) == 0);
return vp; return vp;

1
fs/xfs/linux-2.6/xfs_vnode.h
View File

@ -28,7 +28,6 @@ typedef struct dentry bhv_vname_t;
typedef __u64 bhv_vnumber_t; typedef __u64 bhv_vnumber_t;
typedef struct bhv_vnode { typedef struct bhv_vnode {
bhv_vnumber_t v_number; /* in-core vnode number */
struct inode v_inode; /* Linux inode */ struct inode v_inode; /* Linux inode */
/* inode MUST be last */ /* inode MUST be last */
} bhv_vnode_t; } bhv_vnode_t;

4
fs/xfs/xfs_iget.c
View File

@ -421,8 +421,8 @@ xfs_inode_lock_init(
bhv_vnode_t *vp) bhv_vnode_t *vp)
{ {
mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER,
"xfsino", (long)vp->v_number); "xfsino", ip->i_ino);
mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", vp->v_number); mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino);
init_waitqueue_head(&ip->i_ipin_wait); init_waitqueue_head(&ip->i_ipin_wait);
atomic_set(&ip->i_pincount, 0); atomic_set(&ip->i_pincount, 0);
initnsema(&ip->i_flock, 1, "xfsfino"); initnsema(&ip->i_flock, 1, "xfsfino");