Re: git: ee3a92d1bffc - releng/14.0 - zfs: cherry-pick change from master

Thank you!

On 10/24/23 08:58, Martin Matuska wrote:
> The branch releng/14.0 has been updated by mm:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a
> 
> commit ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a
> Author:     Martin Matuska <mm@FreeBSD.org>
> AuthorDate: 2023-10-20 17:30:32 +0000
> Commit:     Martin Matuska <mm@FreeBSD.org>
> CommitDate: 2023-10-24 15:54:47 +0000
> 
>      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.
>      
>      Approved by:    re (gjb)
>      Requested by:   cperciva
>      Co-Authored-By: Colin Percival <cperciva@FreeBSD.org>
>      Obtained from:  OpenZFS
>      OpenZFS commit: ea30b5a9e0d266baa13398ed8f9435de050f4b25
>      
>      (cherry picked from commit c458bf557d66161730ce644af840e968397a377b)
> ---
>   sys/contrib/openzfs/module/zfs/vdev.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> 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);
>   	}
>   
> 

-- 
Colin Percival
FreeBSD Deputy Release Engineer & EC2 platform maintainer
Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid