Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 21 insertions, 14 deletions

diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c
index 260dd8415dd7..d27c25b27ccd 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
@@ -58,7 +58,7 @@ struct vnode *
 vn_initialize(
         struct inode    *inode)
 {
-        struct vnode    *vp = LINVFS_GET_VP(inode);
+        struct vnode    *vp = vn_from_inode(inode);
 
         XFS_STATS_INC(vn_active);
         XFS_STATS_INC(vn_alloc);
@@ -83,7 +83,7 @@ vn_initialize(
         vp->v_trace = ktrace_alloc(VNODE_TRACE_SIZE, KM_SLEEP);
 #endif  /* XFS_VNODE_TRACE */
 
-        vn_trace_exit(vp, "vn_initialize", (inst_t *)__return_address);
+        vn_trace_exit(vp, __FUNCTION__, (inst_t *)__return_address);
         return vp;
 }
 
@@ -97,7 +97,7 @@ vn_revalidate_core(
         struct vnode    *vp,
         vattr_t         *vap)
 {
-        struct inode    *inode = LINVFS_GET_IP(vp);
+        struct inode    *inode = vn_to_inode(vp);
 
         inode->i_mode       = vap->va_mode;
         inode->i_nlink      = vap->va_nlink;
@@ -129,24 +129,31 @@ vn_revalidate_core(
  * Revalidate the Linux inode from the vnode.
  */
 int
-vn_revalidate(
-        struct vnode    *vp)
+__vn_revalidate(
+        struct vnode    *vp,
+        struct vattr    *vattr)
 {
-        vattr_t         va;
         int             error;
 
-        vn_trace_entry(vp, "vn_revalidate", (inst_t *)__return_address);
-        ASSERT(vp->v_fbhv != NULL);
-
-        va.va_mask = XFS_AT_STAT|XFS_AT_XFLAGS;
-        VOP_GETATTR(vp, &va, 0, NULL, error);
-        if (!error) {
-                vn_revalidate_core(vp, &va);
+        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+        vattr->va_mask = XFS_AT_STAT | XFS_AT_XFLAGS;
+        VOP_GETATTR(vp, vattr, 0, NULL, error);
+        if (likely(!error)) {
+                vn_revalidate_core(vp, vattr);
                 VUNMODIFY(vp);
         }
         return -error;
 }
 
+int
+vn_revalidate(
+        struct vnode    *vp)
+{
+        vattr_t         vattr;
+
+        return __vn_revalidate(vp, &vattr);
+}
+
 /*
  * Add a reference to a referenced vnode.
  */
@@ -159,7 +166,7 @@ vn_hold(
         XFS_STATS_INC(vn_hold);
 
         VN_LOCK(vp);
-        inode = igrab(LINVFS_GET_IP(vp));
+        inode = igrab(vn_to_inode(vp));
         ASSERT(inode);
         VN_UNLOCK(vp, 0);