]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Skip activity check for zhack RO import
authorOlaf Faaland <faaland1@llnl.gov>
Fri, 14 Jul 2017 23:32:55 +0000 (16:32 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 25 Jul 2017 17:22:14 +0000 (13:22 -0400)
"zhack feature stat" performs a read-only import, so the MMP activity
check is not necessary.

Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Closes #6388
Closes #6389

cmd/zhack/zhack.c

index cc414dae1565500e4fc43fe3857b75e4933290ac..70f88fc6987469d1341d8ff36367ce7ba0abf23a 100644 (file)
@@ -151,7 +151,8 @@ zhack_import(char *target, boolean_t readonly)
        }
 
        zfeature_checks_disable = B_TRUE;
-       error = spa_import(target, config, props, ZFS_IMPORT_NORMAL);
+       error = spa_import(target, config, props,
+           (readonly ?  ZFS_IMPORT_SKIP_MMP : ZFS_IMPORT_NORMAL));
        zfeature_checks_disable = B_FALSE;
        if (error == EEXIST)
                error = 0;