Commit 21f55993 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: merge xfs_showargs into xfs_fs_show_options 



No need for a trivial wrapper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 1775c506

fs/xfs/xfs_super.c

+7 −13
Original line number Diff line number Diff line
@@ -406,10 +406,10 @@ struct proc_xfs_info { 
	char		*str;

};



STATIC void

xfs_showargs(

	struct xfs_mount	*mp,

	struct seq_file		*m)

static int

xfs_fs_show_options(

	struct seq_file		*m,

	struct dentry		*root)

{

	static struct proc_xfs_info xfs_info_set[] = {

		/* the few simple ones we can get from the mount struct */
@@ -427,6 +427,7 @@ xfs_showargs( 
		{ XFS_MOUNT_DAX,		",dax" },

		{ 0, NULL }

	};

	struct xfs_mount	*mp = XFS_M(root->d_sb);

	struct proc_xfs_info	*xfs_infop;



	for (xfs_infop = xfs_info_set; xfs_infop->flag; xfs_infop++) {
@@ -478,6 +479,8 @@ xfs_showargs( 


	if (!(mp->m_qflags & XFS_ALL_QUOTA_ACCT))

		seq_puts(m, ",noquota");



	return 0;

}



static uint64_t
@@ -1378,15 +1381,6 @@ xfs_fs_unfreeze( 
	return 0;

}



STATIC int

xfs_fs_show_options(

	struct seq_file		*m,

	struct dentry		*root)

{

	xfs_showargs(XFS_M(root->d_sb), m);

	return 0;

}



/*

 * This function fills in xfs_mount_t fields based on mount args.

 * Note: the superblock _has_ now been read in.