]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_scrub: check progress bar timedwait failures
authorDarrick J. Wong <darrick.wong@oracle.com>
Thu, 17 Oct 2019 02:35:25 +0000 (22:35 -0400)
committerEric Sandeen <sandeen@sandeen.net>
Thu, 17 Oct 2019 02:35:25 +0000 (22:35 -0400)
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>
scrub/progress.c

index 5fda4ccbcd766fae70c13eb392cb2e0be23a2ba3..e93b607f388247830a3f5612a6e49c387a54c442 100644 (file)
@@ -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);