aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2023-10-20 17:30:32 +0000
committerMartin Matuska <mm@FreeBSD.org>2023-10-22 22:45:03 +0000
commitc458bf557d66161730ce644af840e968397a377b (patch)
tree921f636cc7c82bdb19d3d1d58a2fa10575d0d627
parented1535b37cc476720e2bf0017afea6f927dc030f (diff)
downloadsrc-c458bf557d66161730ce644af840e968397a377b.tar.gz
src-c458bf557d66161730ce644af840e968397a377b.zip
zfs: cherry-pick change from master
#15405 ea30b5a9e Set spa_ccw_fail_time=0 when expanding a vdev Fixes 5-minute autoexpand delay on ZFS-root VM images. Requested by: cperciva Co-Authored-By: Colin Percival <cperciva@FreeBSD.org> Obtained from: OpenZFS OpenZFS commit: ea30b5a9e0d266baa13398ed8f9435de050f4b25
-rw-r--r--sys/contrib/openzfs/module/zfs/vdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c
index 87c145593237..afb01c0ef7fd 100644
--- a/sys/contrib/openzfs/module/zfs/vdev.c
+++ b/sys/contrib/openzfs/module/zfs/vdev.c
@@ -4215,6 +4215,7 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate)
/* XXX - L2ARC 1.0 does not support expansion */
if (vd->vdev_aux)
return (spa_vdev_state_exit(spa, vd, ENOTSUP));
+ spa->spa_ccw_fail_time = 0;
spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE);
}