aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-10-16 22:35:25 -0400
committerEric Sandeen <sandeen@sandeen.net>2019-10-16 22:35:25 -0400
commit8808a003cd8ce5014e31032c26e5f4f8efff21dc (patch)
tree0986baa876c21f9a1f8e4bc7f285544e953d24f5
parent0a9ac2051487194e555da7f25c98bc98a0a5c82f (diff)
downloadxfsprogs-dev-8808a003cd8ce5014e31032c26e5f4f8efff21dc.tar.gz
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>
-rw-r--r--scrub/progress.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/scrub/progress.c b/scrub/progress.c
index 5fda4ccbcd..e93b607f38 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);