vserver 1.9.5.x5

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_vnode.c

diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c
index e8094d2..2d2080a 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
@@ -34,7 +34,7 @@
 
 
 uint64_t vn_generation;                /* vnode generation number */
-spinlock_t vnumber_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(vnumber_lock);
 
 /*
  * Dedicated vnode inactive/reclaim sync semaphores.
@@ -199,7 +199,6 @@ vn_revalidate_core(
 {
        struct inode    *inode = LINVFS_GET_IP(vp);
 
-       inode = LINVFS_GET_IP(vp);
        inode->i_mode       = VTTOIF(vap->va_type) | vap->va_mode;
        inode->i_nlink      = vap->va_nlink;
        inode->i_uid        = vap->va_uid;
@@ -424,8 +423,8 @@ vn_remove(
 /*  3 */               (void *)(vn_count(vp)), \
 /*  4 */               (void *)(ra),                           \
 /*  5 */               (void *)(__psunsigned_t)(vp)->v_flag,   \
-/*  6 */               (void *)(__psint_t)smp_processor_id(),  \
-/*  7 */               (void *)(__psint_t)(current->pid),      \
+/*  6 */               (void *)(__psint_t)current_cpu(),       \
+/*  7 */               (void *)(__psint_t)current_pid(),       \
 /*  8 */               (void *)__return_address,               \
 /*  9 */               0, 0, 0, 0, 0, 0, 0)