diff options
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.c | 8 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.h | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_iget.c | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c index 9d9464c..b7ff267 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.c +++ b/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; diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index 2b16136..a5c14a8 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/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; diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c index 001cec7..03f32c6 100644 --- a/fs/xfs/xfs_iget.c +++ b/fs/xfs/xfs_iget.c @@ -421,8 +421,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"); |
