git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #1946: incorrect formatting when listing output of multiple pools with zpool...
[zfs.git]
/
lib
/
libzfs
/
libzfs_dataset.c
diff --git
a/lib/libzfs/libzfs_dataset.c
b/lib/libzfs/libzfs_dataset.c
index
44fdadd
..
e8c329c
100644
(file)
--- a/
lib/libzfs/libzfs_dataset.c
+++ b/
lib/libzfs/libzfs_dataset.c
@@
-413,6
+413,9
@@
make_dataset_handle_common(zfs_handle_t *zhp, zfs_cmd_t *zc)
zhp->zfs_head_type = ZFS_TYPE_VOLUME;
else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
zhp->zfs_head_type = ZFS_TYPE_FILESYSTEM;
zhp->zfs_head_type = ZFS_TYPE_VOLUME;
else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
zhp->zfs_head_type = ZFS_TYPE_FILESYSTEM;
+ else if (zhp->zfs_dmustats.dds_type == DMU_OST_OTHER)
+ return (-1); /* zpios' and other testing datasets are
+ of this type, ignore if encountered */
else
abort();
else
abort();