On Sun, Oct 27, 2019 at 03:55:47PM +0100, Christoph Hellwig wrote:
> No need for a trivial wrapper.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_super.c | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 0e8942bbf840..bcb1575a5652 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -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.
> --
> 2.20.1
>
