summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_import.c
diff options
context:
space:
mode:
authoreschrock <none@none>2005-11-18 22:47:38 -0800
committereschrock <none@none>2005-11-18 22:47:38 -0800
commit088e9d477eee66081e407fbc5a33c4da25f66f6a (patch)
tree423960171a4e0c675a396bff1dd67d8f3f66c107 /usr/src/lib/libzfs/common/libzfs_import.c
parent9ac8606f19e304e832a685ae7060cc3c284b9779 (diff)
downloadillumos-joyent-088e9d477eee66081e407fbc5a33c4da25f66f6a.tar.gz
6344502 placeholder bug for the remaining Makefile cleanup work for ZFS
6343938 ::spa -v tried to read NULL vdev 6345206 zpool iostat doesn't always line up
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_import.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_import.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_import.c b/usr/src/lib/libzfs/common/libzfs_import.c
index c71bc437f5..b7eb81873d 100644
--- a/usr/src/lib/libzfs/common/libzfs_import.c
+++ b/usr/src/lib/libzfs/common/libzfs_import.c
@@ -720,7 +720,8 @@ zpool_in_use(int fd, char **statestr, char **namestr)
* it's not in use.
*/
if ((zhp = zpool_open_canfail(name)) != NULL &&
- (pool_config = zpool_get_config(zhp)) != NULL) {
+ (pool_config = zpool_get_config(zhp, NULL))
+ != NULL) {
nvlist_t *nvroot;
verify(nvlist_lookup_nvlist(pool_config,