From: Chunwei Chen Date: Thu, 25 May 2017 22:56:12 +0000 (-0700) Subject: Fix import wrong spare/l2 device when path change X-Git-Tag: zfs-0.7.0-rc5~69 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b870c4b5d716d87ddfb29f28745e639dd635fd5f;p=zfs Fix import wrong spare/l2 device when path change If, for example, your aux device was /dev/sdc, but now the aux device is removed and /dev/sdc points to other device. zpool import will still use that device and corrupt it. The problem is that the spa_validate_aux in spa_import, rather than validate the on-disk label, it would actually write label to disk. We remove them since spa_load_{spares,l2cache} seems to do everything we need and they would actually validate on-disk label. Reviewed-by: Brian Behlendorf Signed-off-by: Chunwei Chen Closes #6158 --- diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 70756ce49..031535321 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -4114,12 +4114,6 @@ spa_import(char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags) VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0); - if (error == 0) - error = spa_validate_aux(spa, nvroot, -1ULL, - VDEV_ALLOC_SPARE); - if (error == 0) - error = spa_validate_aux(spa, nvroot, -1ULL, - VDEV_ALLOC_L2CACHE); spa_config_exit(spa, SCL_ALL, FTAG); if (props != NULL)