From ff998d804ff2fec3adc91fd0e78d25998094aca9 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Wed, 18 Jan 2012 15:31:52 -0800 Subject: [PATCH] Ignore dataset if the dds_type is DMU_OST_OTHER Since the zpios and potentially other ZFS tests use the DMU_OST_OTHER type to label their datasets, the zpool and zfs commands should gracefully handle this type when it is encountered. This patch modifies the commands' behavior to ignore any datasets with a dds_type of DMU_OST_OTHER. Signed-off-by: Prakash Surya Signed-off-by: Brian Behlendorf Closes #536 --- lib/libzfs/libzfs_dataset.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index 44fdadd..e8c329c 100644 --- 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; + 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(); -- 1.8.3.1