2 files changed, 7 insertions, 8 deletions

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 21f0e8257590..66a9a9e76cbe 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -213,17 +213,16 @@ xfs_fs_get_parent(
         struct dentry           *child)
 {
         int                     error;
-        bhv_vnode_t             *cvp;
+        struct xfs_inode        *cip;
         struct dentry           *parent;
 
-        cvp = NULL;
-        error = xfs_lookup(XFS_I(child->d_inode), &dotdot, &cvp);
+        error = xfs_lookup(XFS_I(child->d_inode), &dotdot, &cip);
         if (unlikely(error))
                 return ERR_PTR(-error);
 
-        parent = d_alloc_anon(vn_to_inode(cvp));
+        parent = d_alloc_anon(cip->i_vnode);
         if (unlikely(!parent)) {
-                VN_RELE(cvp);
+                iput(cip->i_vnode);
                 return ERR_PTR(-ENOMEM);
         }
         return parent;
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 215158cbac43..01d9b3f1e044 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -372,13 +372,13 @@ xfs_vn_lookup(
         struct dentry   *dentry,
         struct nameidata *nd)
 {
-        bhv_vnode_t     *cvp;
+        struct xfs_inode *cip;
         int             error;
 
         if (dentry->d_name.len >= MAXNAMELEN)
                 return ERR_PTR(-ENAMETOOLONG);
 
-        error = xfs_lookup(XFS_I(dir), dentry, &cvp);
+        error = xfs_lookup(XFS_I(dir), dentry, &cip);
         if (unlikely(error)) {
                 if (unlikely(error != ENOENT))
                         return ERR_PTR(-error);
@@ -386,7 +386,7 @@ xfs_vn_lookup(
                 return NULL;
         }
 
-        return d_splice_alias(vn_to_inode(cvp), dentry);
+        return d_splice_alias(cip->i_vnode, dentry);
 }
 
 STATIC int