diff options
| author | Toomas Soome <tsoome@FreeBSD.org> | 2020-09-23 08:22:14 +0000 |
|---|---|---|
| committer | Toomas Soome <tsoome@FreeBSD.org> | 2020-09-23 08:22:14 +0000 |
| commit | 867ae3c38d1aa97300bd35f457037b3f1a0a103f (patch) | |
| tree | f62c57aa8871cf85c39db16ba4282abee9ff8ed4 /stand | |
| parent | 6155466afb8d1a01ad315e5592dafc1c1feb59a9 (diff) | |
Notes
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/efi/libefi/efizfs.c | 3 | ||||
| -rw-r--r-- | stand/libsa/zfs/zfs.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/stand/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c index aedb9c2294cd7..7f3986d471408 100644 --- a/stand/efi/libefi/efizfs.c +++ b/stand/efi/libefi/efizfs.c @@ -99,7 +99,7 @@ efi_zfs_probe(void) pdinfo_list_t *hdi; pdinfo_t *hd, *pd = NULL; char devname[SPECNAMELEN + 1]; - uint64_t guid; + uint64_t guid; hdi = efiblk_get_pdinfo_list(&efipart_hddev); STAILQ_INIT(&zfsinfo); @@ -114,6 +114,7 @@ efi_zfs_probe(void) STAILQ_FOREACH(pd, &hd->pd_part, pd_link) { snprintf(devname, sizeof(devname), "%s%dp%d:", efipart_hddev.dv_name, hd->pd_unit, pd->pd_unit); + guid = 0; if (zfs_probe_dev(devname, &guid) == 0) { insert_zfs(pd->pd_handle, guid); if (pd->pd_handle == boot_img->DeviceHandle) diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index ea0fdace680c2..645c87031e53b 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -651,7 +651,8 @@ zfs_probe(int fd, uint64_t *pool_guid) spa = NULL; ret = vdev_probe(vdev_read, vdev_write, (void *)(uintptr_t)fd, &spa); if (ret == 0 && pool_guid != NULL) - *pool_guid = spa->spa_guid; + if (*pool_guid == 0) + *pool_guid = spa->spa_guid; return (ret); } |