From 7dcd31883299b3ee3801dd701f7a986a0af9b2f9 Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Sun, 14 Apr 2019 14:03:06 -0400 Subject: [PATCH] Cleanup nits from ab7615d92 This patch simply up cleans up a nit and corrects an error message issue that were introduced in the Multiple DVA scrub patch. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Tom Caputi Closes #8619 --- cmd/zinject/zinject.c | 2 +- module/zfs/vdev_mirror.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/zinject/zinject.c b/cmd/zinject/zinject.c index 393e50a28e..cff7f861a2 100644 --- a/cmd/zinject/zinject.c +++ b/cmd/zinject/zinject.c @@ -1221,7 +1221,7 @@ main(int argc, char **argv) if (dvas != 0) { if (error == EACCES || error == EINVAL) { - (void) fprintf(stderr, "the '-c' option may " + (void) fprintf(stderr, "the '-C' option may " "not be used with logical data errors " "'decrypt' and 'decompress'\n"); libzfs_fini(g_zfs); diff --git a/module/zfs/vdev_mirror.c b/module/zfs/vdev_mirror.c index a095e09779..59cc2dcdd2 100644 --- a/module/zfs/vdev_mirror.c +++ b/module/zfs/vdev_mirror.c @@ -257,8 +257,6 @@ vdev_mirror_map_init(zio_t *zio) dsl_scan_t *scn = spa->spa_dsl_pool->dp_scan; dva_t dva_copy[SPA_DVAS_PER_BP]; - c = BP_GET_NDVAS(zio->io_bp); - /* * The sequential scrub code sorts and issues all DVAs * of a bp separately. Each of these IOs includes all