xfs: clean up printing inode32/64 in xfs_showargs

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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 93ed0871b1cfded68f0f3a31d49efd559039ee56..0e8942bbf8401495526b1e67390b6a656815119b 100644 (file)
--- 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",