| Message ID | 20191027145547.25157-12-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/12] xfs: remove the biosize mount option | expand |
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 >
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",
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> --- fs/xfs/xfs_super.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)