xfs_scrub: abort all read verification work immediately on error

Add a new abort function to the read verify pool code so that the caller
can immediately abort all pending verification work if things start
going wrong.  There's no point in waiting for queued work to run if
we've already decided to bail.

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/phase6.c b/scrub/phase6.c
index d9285feed702e3aa7e480daa4c1518ddf8e3dfa9..4c81ee7bade7e507fabc6c623e0da00d8f055306 100644 (file)
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -514,16 +514,16 @@ _("Could not create data device media verifier."));
 
 out_rtpool:
        if (vs.rvp_realtime) {
-               read_verify_pool_flush(vs.rvp_realtime);
+               read_verify_pool_abort(vs.rvp_realtime);
                read_verify_pool_destroy(vs.rvp_realtime);
        }
 out_logpool:
        if (vs.rvp_log) {
-               read_verify_pool_flush(vs.rvp_log);
+               read_verify_pool_abort(vs.rvp_log);
                read_verify_pool_destroy(vs.rvp_log);
        }
 out_datapool:
-       read_verify_pool_flush(vs.rvp_data);
+       read_verify_pool_abort(vs.rvp_data);
        read_verify_pool_destroy(vs.rvp_data);
 out_rbad:
        bitmap_free(&vs.r_bad);

diff --git a/scrub/read_verify.c b/scrub/read_verify.c
index d020ce2f2f0d08047b662048bf1c547871639ac0..835b96606eca421b3059792fcce38b6de81f93e8 100644 (file)
--- a/scrub/read_verify.c
+++ b/scrub/read_verify.c
@@ -121,6 +121,16 @@ out_free:
        return NULL;
 }
 
+/* Abort all verification work. */
+void
+read_verify_pool_abort(
+       struct read_verify_pool         *rvp)
+{
+       if (!rvp->runtime_error)
+               rvp->runtime_error = ECANCELED;
+       workqueue_terminate(&rvp->wq);
+}
+
 /* Finish up any read verification work. */
 void
 read_verify_pool_flush(

diff --git a/scrub/read_verify.h b/scrub/read_verify.h
index 5fabe5e047b511ed7349f9ee8294c0de031904c9..f0ed89028de452b79b7df6bc051bf71c47e0169c 100644 (file)
--- a/scrub/read_verify.h
+++ b/scrub/read_verify.h
@@ -19,6 +19,7 @@ struct read_verify_pool *read_verify_pool_init(struct scrub_ctx *ctx,
                struct disk *disk, size_t miniosz,
                read_verify_ioerr_fn_t ioerr_fn,
                unsigned int submitter_threads);
+void read_verify_pool_abort(struct read_verify_pool *rvp);
 void read_verify_pool_flush(struct read_verify_pool *rvp);
 void read_verify_pool_destroy(struct read_verify_pool *rvp);