Commit 846410cc authored Nov 04, 2019 by Ian Kent Committed by Darrick J. Wong Nov 05, 2019

xfs: avoid redundant checks when options is empty



When options passed to xfs_parseargs() is NULL the checks performed
after taking the branch are made with the initial values of dsunit,
dswidth and iosizelog. But all the checks do nothing in this case
so return immediately instead.

Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-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>

parent c0a67916

fs/xfs/xfs_super.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ xfs_parseargs(
		mp->m_allocsize_log = 16; /* 64k */

		if (!options)
		goto done;
		return 0;

		while ((p = strsep(&options, ",")) != NULL) {
		int token;
		@@ -379,7 +379,6 @@ xfs_parseargs(
		return -EINVAL;
		}

		done:
		if (mp->m_logbufs != -1 &&
		mp->m_logbufs != 0 &&
		(mp->m_logbufs < XLOG_MIN_ICLOGS \|\|

Admin message