Skip to content

Skip searching for zpool labels in volumes #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: Geo-Digital-zpool-logs
Choose a base branch
from
Open

Skip searching for zpool labels in volumes #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d26fb9
Skip searching for zpool labels in volumes
datacore-rm Feb 22, 2023
0916f02
Logged zpool.exe exit code.
datacore-rm Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ZFSin/zfs/cmd/zpool/zpool_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion ZFSin/zfs/lib/libzfs/libzfs_import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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
Expand Down