xfs: remove xfs_setup_existing_inode

xfs_setup_existing_inode only has a single caller, fold it into that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index d0bc8ea79d40f8e005933b0d1a42aaff502291a5..37caed10c089604bb555cfc976aae077187cd02c 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -817,8 +817,11 @@ again:
         * now.  If it's a new inode being created, xfs_init_new_inode will
         * handle it.
         */
-       if (xfs_iflags_test(ip, XFS_INEW) && VFS_I(ip)->i_mode != 0)
-               xfs_setup_existing_inode(ip);
+       if (xfs_iflags_test(ip, XFS_INEW) && VFS_I(ip)->i_mode != 0) {
+               xfs_setup_inode(ip);
+               xfs_setup_iops(ip);
+               xfs_finish_inode_setup(ip);
+       }
        return 0;
 
 out_error_or_again:

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index bd6d335571943d113b24173bc83daf930bab2623..724baea02c8d47753206e6180bfd8800de6e2354 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -630,13 +630,6 @@ static inline void xfs_finish_inode_setup(struct xfs_inode *ip)
        unlock_new_inode(VFS_I(ip));
 }
 
-static inline void xfs_setup_existing_inode(struct xfs_inode *ip)
-{
-       xfs_setup_inode(ip);
-       xfs_setup_iops(ip);
-       xfs_finish_inode_setup(ip);
-}
-
 void xfs_irele(struct xfs_inode *ip);
 
 extern struct kmem_cache       *xfs_inode_cache;