xfs: merge freeing of mp names and mp

In all cases when struct xfs_mount (mp) fields m_rtname and m_logname
are freed mp is also freed, so merge these into a single function
xfs_mount_free()

Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
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_super.c b/fs/xfs/xfs_super.c
index eb919e74d8ebf077305ad6c174a061148ee9a746..6d908b76aa9e8c3e8e2e71edd811fd517a6fc145 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -998,12 +998,13 @@ xfs_fs_drop_inode(
        return generic_drop_inode(inode) || (ip->i_flags & XFS_IDONTCACHE);
 }
 
-STATIC void
-xfs_free_names(
+static void
+xfs_mount_free(
        struct xfs_mount        *mp)
 {
        kfree(mp->m_rtname);
        kfree(mp->m_logname);
+       kmem_free(mp);
 }
 
 STATIC int
@@ -1178,8 +1179,7 @@ xfs_test_remount_options(
 
        tmp_mp->m_super = sb;
        error = xfs_parseargs(tmp_mp, options);
-       xfs_free_names(tmp_mp);
-       kmem_free(tmp_mp);
+       xfs_mount_free(tmp_mp);
 
        return error;
 }
@@ -1710,8 +1710,7 @@ xfs_fs_fill_super(
        xfs_close_devices(mp);
  out_free_names:
        sb->s_fs_info = NULL;
-       xfs_free_names(mp);
-       kmem_free(mp);
+       xfs_mount_free(mp);
  out:
        return error;
 
@@ -1742,8 +1741,7 @@ xfs_fs_put_super(
        xfs_close_devices(mp);
 
        sb->s_fs_info = NULL;
-       xfs_free_names(mp);
-       kmem_free(mp);
+       xfs_mount_free(mp);
 }
 
 STATIC struct dentry *