vdev probe to slow disk can stall mmp write checker

[mirror_zfs.git] / module / zfs / vdev_label.c

diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c
index c31f48028bbcde10a0abf17344f487edb8a57426..ed592514fdedeb2c6d143f6eee1afe2a81fd5868 100644 (file)
--- a/module/zfs/vdev_label.c
+++ b/module/zfs/vdev_label.c
@@ -2027,6 +2027,7 @@ retry:
        /*
         * If this isn't a resync due to I/O errors,
         * and nothing changed in this transaction group,
+        * and multihost protection isn't enabled,
         * and the vdev configuration hasn't changed,
         * then there's nothing to do.
         */
@@ -2034,7 +2035,8 @@ retry:
                boolean_t changed = uberblock_update(ub, spa->spa_root_vdev,
                    txg, spa->spa_mmp.mmp_delay);
 
-               if (!changed && list_is_empty(&spa->spa_config_dirty_list))
+               if (!changed && list_is_empty(&spa->spa_config_dirty_list) &&
+                   !spa_multihost(spa))
                        return (0);
        }