]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Cleanup nits from ab7615d92
authorTom Caputi <tcaputi@datto.com>
Sun, 14 Apr 2019 18:03:06 +0000 (14:03 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sun, 14 Apr 2019 18:03:06 +0000 (11:03 -0700)
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 <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #8619

cmd/zinject/zinject.c
module/zfs/vdev_mirror.c

index 393e50a28e022134393be32091a60111acd198f5..cff7f861a2e346b4b7c2e34853866cf7f5ad5762 100644 (file)
@@ -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);
index a095e09779cce40a240d0cca92155848dab8de32..59cc2dcdd2ca7687bb3371aca3dc67d81dbc82c5 100644 (file)
@@ -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