c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Importing from cachefile can trip assertion

Browse Source 
When importing from cachefile, it is possible that the builtin retry
logic will trip an assertion because it also fails to find the pool.
This fix addresses that case and returns the correct error message to
the user.

Reviewed-by: Richard Yao <ryao@gentoo.org>
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: George Wilson <gwilson@delphix.com>
Closes #13781
This commit is contained in:
George Wilson 2022-08-26 16:04:27 -05:00 committed by Tony Hutter
parent b1be0a5c15
commit 15b64fbc94
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzutil/zutil_import.c
View File

@ -1660,6 +1660,8 @@ zpool_find_import_cached(libpc_handle_t *hdl, importargs_t *iarg)
* caller. * caller.
*/ */
nvpair_t *pair = nvlist_next_nvpair(nv, NULL); nvpair_t *pair = nvlist_next_nvpair(nv, NULL);
if (pair == NULL)
continue;
fnvlist_add_nvlist(pools, nvpair_name(pair), fnvlist_add_nvlist(pools, nvpair_name(pair),
fnvpair_value_nvlist(pair)); fnvpair_value_nvlist(pair));