xfs: remove xfs_ifree_local_data

xfs_ifree only need to free inline data in the data fork, as we've
already taken care of the attr fork before (and in fact freed the
fork structure).  Just open code the freeing of the inline data.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 549ff468b7b60648909292840fdd9374e55ba84e..7d3144dc99b72bf40f242ba23a99f23811e94884 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2711,24 +2711,6 @@ xfs_ifree_cluster(
        return 0;
 }
 
-/*
- * Free any local-format buffers sitting around before we reset to
- * extents format.
- */
-static inline void
-xfs_ifree_local_data(
-       struct xfs_inode        *ip,
-       int                     whichfork)
-{
-       struct xfs_ifork        *ifp;
-
-       if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_LOCAL)
-               return;
-
-       ifp = XFS_IFORK_PTR(ip, whichfork);
-       xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
-}
-
 /*
  * This is called to return an inode to the inode free list.
  * The inode should already be truncated to 0 length and have
@@ -2765,8 +2747,16 @@ xfs_ifree(
        if (error)
                return error;
 
-       xfs_ifree_local_data(ip, XFS_DATA_FORK);
-       xfs_ifree_local_data(ip, XFS_ATTR_FORK);
+       /*
+        * Free any local-format data sitting around before we reset the
+        * data fork to extents format.  Note that the attr fork data has
+        * already been freed by xfs_attr_inactive.
+        */
+       if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
+               kmem_free(ip->i_df.if_u1.if_data);
+               ip->i_df.if_u1.if_data = NULL;
+               ip->i_df.if_bytes = 0;
+       }
 
        VFS_I(ip)->i_mode = 0;          /* mark incore inode as free */
        ip->i_d.di_flags = 0;