diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 13:57:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 13:57:32 +0200 |
| commit | 975439fe73d1f0f7ce8c235c66783bd34dc459c3 (patch) | |
| tree | 84e29852d96283b13c6e603f86bd506a631343c5 /fs/xfs/linux-2.6/xfs_vnode.c | |
| parent | ef31023743e66de7184e9aad432291c842a6384b (diff) | |
| parent | 129d6aba444d1e99d4cbfb9866a4652912426b65 (diff) | |
Merge branch 'x86/amd-iommu' into x86/urgent
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_vnode.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c index 25488b6d9881..b52528bbbfff 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.c +++ b/fs/xfs/linux-2.6/xfs_vnode.c @@ -33,7 +33,7 @@ /* - * Dedicated vnode inactive/reclaim sync semaphores. + * Dedicated vnode inactive/reclaim sync wait queues. * Prime number of hash buckets since address is used as the key. */ #define NVSYNC 37 @@ -82,24 +82,6 @@ vn_ioerror( xfs_do_force_shutdown(ip->i_mount, SHUTDOWN_DEVICE_REQ, f, l); } - -/* - * Add a reference to a referenced vnode. - */ -bhv_vnode_t * -vn_hold( - bhv_vnode_t *vp) -{ - struct inode *inode; - - XFS_STATS_INC(vn_hold); - - inode = igrab(vn_to_inode(vp)); - ASSERT(inode); - - return vp; -} - #ifdef XFS_INODE_TRACE /* @@ -108,7 +90,7 @@ vn_hold( */ static inline int xfs_icount(struct xfs_inode *ip) { - bhv_vnode_t *vp = XFS_ITOV_NULL(ip); + struct inode *vp = VFS_I(ip); if (vp) return vn_count(vp); |