]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xfs: avoid redundant checks when options is empty
authorIan Kent <raven@themaw.net>
Mon, 4 Nov 2019 21:58:44 +0000 (13:58 -0800)
committerDarrick J. Wong <darrick.wong@oracle.com>
Tue, 5 Nov 2019 16:28:26 +0000 (08:28 -0800)
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>
fs/xfs/xfs_super.c

index 0dc072700599fbf0c733d6dae4b832051c1bc5d3..17188a9ed5411b6454ef83132d2a1018eb6e02bd 100644 (file)
@@ -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 ||