[XFS] call common xfs vfs-level helpers directly and remove vfs operations

Also remove the now dead behavior code.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29505a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index 03f32c68731f..772bbc7a8ac9 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -343,8 +343,7 @@ finish_inode:
          * If we have a real type for an on-disk inode, we can set ops(&unlock)
          * now.  If it's a new inode being created, xfs_ialloc will handle it.
          */
-        bhv_vfs_init_vnode(XFS_MTOVFS(mp), vp, ip, 1);
-
+        xfs_initialize_vnode(mp, vp, ip);
         return 0;
 }
 
@@ -370,7 +369,8 @@ xfs_iget(
         XFS_STATS_INC(xs_ig_attempts);
 
 retry:
-        if ((inode = iget_locked(XFS_MTOVFS(mp)->vfs_super, ino))) {
+        inode = iget_locked(XFS_MTOVFS(mp)->vfs_super, ino);
+        if (inode) {
                 xfs_inode_t     *ip;
 
                 vp = vn_from_inode(inode);