[XFS] cleanup vnode use in xfs_lookup

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30550a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

4 files changed, 10 insertions, 11 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
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index fa694dc5d309..3418c94bcf17 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -1763,7 +1763,7 @@ int
 xfs_lookup(
         xfs_inode_t             *dp,
         bhv_vname_t             *dentry,
-        bhv_vnode_t             **vpp)
+        xfs_inode_t             **ipp)
 {
         xfs_inode_t             *ip;
         xfs_ino_t               e_inum;
@@ -1778,7 +1778,7 @@ xfs_lookup(
         lock_mode = xfs_ilock_map_shared(dp);
         error = xfs_dir_lookup_int(dp, lock_mode, dentry, &e_inum, &ip);
         if (!error) {
-                *vpp = XFS_ITOV(ip);
+                *ipp = ip;
                 xfs_itrace_ref(ip);
         }
         xfs_iunlock_map_shared(dp, lock_mode);
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h
index 71e9b15276f5..12e581865bdf 100644
--- a/fs/xfs/xfs_vnodeops.h
+++ b/fs/xfs/xfs_vnodeops.h
@@ -24,7 +24,7 @@ int xfs_fsync(struct xfs_inode *ip, int flag, xfs_off_t start,
 int xfs_release(struct xfs_inode *ip);
 int xfs_inactive(struct xfs_inode *ip);
 int xfs_lookup(struct xfs_inode *dp, bhv_vname_t *dentry,
-                bhv_vnode_t **vpp);
+                struct xfs_inode **ipp);
 int xfs_create(struct xfs_inode *dp, bhv_vname_t *dentry, mode_t mode,
                 xfs_dev_t rdev, struct xfs_inode **ipp, struct cred *credp);
 int xfs_remove(struct xfs_inode *dp, bhv_vname_t        *dentry);