From 8808a003cd8ce5014e31032c26e5f4f8efff21dc Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 16 Oct 2019 22:35:25 -0400 Subject: [PATCH] xfs_scrub: check progress bar timedwait failures Check for failures in the timedwait for progressbar reporting. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- scrub/progress.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- 2.47.3