From b24771a8c9e4752456a2db69476388fb45a3f751 Mon Sep 17 00:00:00 2001 From: loli10K Date: Mon, 16 Sep 2019 19:46:02 +0200 Subject: [PATCH] Prevent gcc -Werror=maybe-uninitialized warnings in spa_wait_common() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit fixes the following build failure detected on Debian9 (GCC 6.3.0): CC [M] module/zfs/spa.o module/zfs/spa.c: In function ‘spa_wait_common.part.31’: module/zfs/spa.c:9468:6: error: ‘in_progress’ may be used uninitialized in this function [-Werror=maybe-uninitialized] if (!in_progress || spa->spa_waiters_cancel || error) ^ cc1: all warnings being treated as errors Reviewed-by: Chris Dunlop Reviewed-by: Brian Behlendorf Reviewed-by: John Gallagher Signed-off-by: loli10K Closes #9326 --- module/zfs/spa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 0f1a2a9eb..7e5c474eb 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -9465,7 +9465,7 @@ spa_wait_common(const char *pool, zpool_wait_activity_t activity, error = spa_activity_in_progress(spa, activity, use_tag, tag, &in_progress); - if (!in_progress || spa->spa_waiters_cancel || error) + if (error || !in_progress || spa->spa_waiters_cancel) break; *waited = B_TRUE;