From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 17 Oct 2019 02:35:25 +0000 (-0400)
Subject: xfs_scrub: check progress bar timedwait failures
X-Git-Tag: v5.3.0-rc2~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8808a003cd8ce5014e31032c26e5f4f8efff21dc;p=thirdparty%2Fxfsprogs-dev.git

xfs_scrub: check progress bar timedwait failures

Check for failures in the timedwait for progressbar reporting.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/scrub/progress.c b/scrub/progress.c
index 5fda4ccbc..e93b607f3 100644
--- a/scrub/progress.c
+++ b/scrub/progress.c
@@ -130,7 +130,9 @@ progress_report_thread(void *arg)
 			abstime.tv_sec++;
 			abstime.tv_nsec -= NSEC_PER_SEC;
 		}
-		pthread_cond_timedwait(&pt.wakeup, &pt.lock, &abstime);
+		ret = pthread_cond_timedwait(&pt.wakeup, &pt.lock, &abstime);
+		if (ret && ret != ETIMEDOUT)
+			break;
 		if (pt.terminate)
 			break;
 		ret = ptcounter_value(pt.ptc, &progress_val);