From da9c6c033388c19cf3a2b4c5a9ab4287cb831c9c Mon Sep 17 00:00:00 2001 From: Mark Maybee Date: Wed, 12 Jan 2022 17:15:30 -0700 Subject: [PATCH] Remove VERIFY() in vdev_props_set_sync() Reviewed-by: Allan Jude Reviewed-by: Brian Behlendorf Signed-off-by: Mark Maybee Closes #12951 --- module/zfs/vdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index fc914b239f5f..451d1b9a0b6c 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -5476,7 +5476,10 @@ vdev_props_set_sync(void *arg, dmu_tx_t *tx) vdev_guid = fnvlist_lookup_uint64(nvp, ZPOOL_VDEV_PROPS_SET_VDEV); nvprops = fnvlist_lookup_nvlist(nvp, ZPOOL_VDEV_PROPS_SET_PROPS); vd = spa_lookup_by_guid(spa, vdev_guid, B_TRUE); - VERIFY(vd != NULL); + + /* this vdev could get removed while waiting for this sync task */ + if (vd == NULL) + return; mutex_enter(&spa->spa_props_lock);