qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ian Kent 2019-11-04 13:58:42 -08:00 committed by Darrick J. Wong
parent 7b77b46a61
commit a943f372c2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/xfs/xfs_super.c
View File

@ -998,12 +998,13 @@ xfs_fs_drop_inode(
return generic_drop_inode(inode) || (ip->i_flags & XFS_IDONTCACHE); return generic_drop_inode(inode) || (ip->i_flags & XFS_IDONTCACHE);
} }
STATIC void static void
xfs_free_names( xfs_mount_free(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
kfree(mp->m_rtname); kfree(mp->m_rtname);
kfree(mp->m_logname); kfree(mp->m_logname);
kmem_free(mp);
} }
STATIC int STATIC int
@ -1178,8 +1179,7 @@ xfs_test_remount_options(
tmp_mp->m_super = sb; tmp_mp->m_super = sb;
error = xfs_parseargs(tmp_mp, options); error = xfs_parseargs(tmp_mp, options);
xfs_free_names(tmp_mp); xfs_mount_free(tmp_mp);
kmem_free(tmp_mp);
return error; return error;
} }
@ -1710,8 +1710,7 @@ xfs_fs_fill_super(
xfs_close_devices(mp); xfs_close_devices(mp);
out_free_names: out_free_names:
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
xfs_free_names(mp); xfs_mount_free(mp);
kmem_free(mp);
out: out:
return error; return error;
@ -1742,8 +1741,7 @@ xfs_fs_put_super(
xfs_close_devices(mp); xfs_close_devices(mp);
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
xfs_free_names(mp); xfs_mount_free(mp);
kmem_free(mp);
} }
STATIC struct dentry * STATIC struct dentry *