From 9d26fb96a5b87358d22b2ca903a8319a9f4683f5 Mon Sep 17 00:00:00 2001 From: datacore-rm Date: Wed, 22 Feb 2023 10:21:51 +0530 Subject: [PATCH 1/2] Skip searching for zpool labels in volumes --- ZFSin/zfs/lib/libzfs/libzfs_import.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ZFSin/zfs/lib/libzfs/libzfs_import.c b/ZFSin/zfs/lib/libzfs/libzfs_import.c index fb0a7a20..eb483ec3 100644 --- a/ZFSin/zfs/lib/libzfs/libzfs_import.c +++ b/ZFSin/zfs/lib/libzfs/libzfs_import.c @@ -2257,6 +2257,7 @@ zpool_find_import_win(libzfs_handle_t *hdl, importargs_t *iarg) } // while SetupDiEnumDeviceInterfaces TraceWrite("After enumerating devices [%s:%d]", __func__, __LINE__); +#if 0 /* Now lets iterate the partitions (volumes) */ HANDLE vol; vol = FindFirstVolume(rdsk, sizeof(rdsk)); @@ -2285,7 +2286,7 @@ zpool_find_import_win(libzfs_handle_t *hdl, importargs_t *iarg) } TraceWrite("After processing the Volumes [%s:%d]", __func__, __LINE__); - +#endif /* * create a thread pool to do all of this in parallel; * rn_nozpool is not protected, so this is racy in that From 0916f02f148e091ee26280e837c2f6a27bdc99dc Mon Sep 17 00:00:00 2001 From: datacore-rm Date: Wed, 22 Feb 2023 13:40:16 +0530 Subject: [PATCH 2/2] Logged zpool.exe exit code. --- ZFSin/zfs/cmd/zpool/zpool_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZFSin/zfs/cmd/zpool/zpool_main.c b/ZFSin/zfs/cmd/zpool/zpool_main.c index 36e4d6cd..a65a58f2 100644 --- a/ZFSin/zfs/cmd/zpool/zpool_main.c +++ b/ZFSin/zfs/cmd/zpool/zpool_main.c @@ -8889,7 +8889,7 @@ main(int argc, char **argv) (void) printf("dumping core by request\n"); abort(); } - TraceWrite("Zpool main funct ended [%s:%d]", __func__, __LINE__); + TraceWrite("Zpool main funct ended.ret=%d [%s:%d]", ret, __func__, __LINE__); TraceClose(); mutex_destroy(&log_lock); return (ret);