From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, Ian Kent <raven@themaw.net>
Subject: Re: [PATCH 11/12] xfs: clean up printing inode32/64 in xfs_showargs
Date: Mon, 28 Oct 2019 10:14:05 -0700 [thread overview]
Message-ID: <20191028171405.GT15222@magnolia> (raw)
In-Reply-To: <20191027145547.25157-12-hch@lst.de>
On Sun, Oct 27, 2019 at 03:55:46PM +0100, Christoph Hellwig wrote:
> inode64 is the only value remaining in the unset array. Special case
> the inode32/64 options with an explicit seq_printf that prints either
> inode32 or inode64, and remove the unset array.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_super.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 93ed0871b1cf..0e8942bbf840 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -423,26 +423,19 @@ xfs_showargs(
> { XFS_MOUNT_FILESTREAMS, ",filestreams" },
> { XFS_MOUNT_GRPID, ",grpid" },
> { XFS_MOUNT_DISCARD, ",discard" },
> - { XFS_MOUNT_SMALL_INUMS, ",inode32" },
> { XFS_MOUNT_LARGEIO, ",largeio" },
> { XFS_MOUNT_DAX, ",dax" },
> { 0, NULL }
> };
> - static struct proc_xfs_info xfs_info_unset[] = {
> - /* the few simple ones we can get from the mount struct */
> - { XFS_MOUNT_SMALL_INUMS, ",inode64" },
> - { 0, NULL }
> - };
> struct proc_xfs_info *xfs_infop;
>
> for (xfs_infop = xfs_info_set; xfs_infop->flag; xfs_infop++) {
> if (mp->m_flags & xfs_infop->flag)
> seq_puts(m, xfs_infop->str);
> }
> - for (xfs_infop = xfs_info_unset; xfs_infop->flag; xfs_infop++) {
> - if (!(mp->m_flags & xfs_infop->flag))
> - seq_puts(m, xfs_infop->str);
> - }
> +
> + seq_printf(m, ",inode%d",
> + (mp->m_flags & XFS_MOUNT_SMALL_INUMS) ? 32 : 64);
>
> if (mp->m_flags & XFS_MOUNT_ALLOCSIZE)
> seq_printf(m, ",allocsize=%dk",
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-10-28 17:16 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 14:55 decruft misc mount related code v2 Christoph Hellwig
2019-10-27 14:55 ` [PATCH 01/12] xfs: remove the biosize mount option Christoph Hellwig
2019-10-27 14:55 ` [PATCH 02/12] xfs: remove the dsunit and dswidth variables in xfs_parseargs Christoph Hellwig
2019-10-28 16:50 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 03/12] xfs: cleanup calculating the stat optimal I/O size Christoph Hellwig
2019-10-28 16:50 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 04/12] xfs: don't use a different allocsice for -o wsync mounts Christoph Hellwig
2019-10-28 17:05 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 05/12] xfs: remove the m_readio_* fields in struct xfs_mount Christoph Hellwig
2019-10-28 17:06 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 06/12] xfs: rename the m_writeio_* " Christoph Hellwig
2019-10-28 17:07 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 07/12] xfs: simplify parsing of allocsize mount option Christoph Hellwig
2019-10-28 17:11 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 08/12] xfs: rename the XFS_MOUNT_DFLT_IOSIZE option to XFS_MOUNT_ALLOCISZE Christoph Hellwig
2019-10-28 17:12 ` Darrick J. Wong
2019-10-29 7:50 ` Christoph Hellwig
2019-10-27 14:55 ` [PATCH 09/12] xfs: reverse the polarity of XFS_MOUNT_COMPAT_IOSIZE Christoph Hellwig
2019-10-28 17:13 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 10/12] xfs: clean up printing the allocsize option in xfs_showargs Christoph Hellwig
2019-10-28 17:13 ` Darrick J. Wong
2019-10-27 14:55 ` [PATCH 11/12] xfs: clean up printing inode32/64 " Christoph Hellwig
2019-10-28 17:14 ` Darrick J. Wong [this message]
2019-10-27 14:55 ` [PATCH 12/12] xfs: merge xfs_showargs into xfs_fs_show_options Christoph Hellwig
2019-10-28 17:14 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028171405.GT15222@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=raven@themaw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox