Attachment #118115 for bug #160283

View | Details | Raw Unified | Return to bug 160283
Collapse All | Expand All




	}

	/*
	 * We've managed to open the dataset and gather statistics.  Determine
	 * the high-level type.
	 */
	if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
		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
		zhp->zfs_dmustats.dds_inconsistent = 1;

	if (zhp->zfs_dmustats.dds_is_snapshot)
		zhp->zfs_type = ZFS_TYPE_SNAPSHOT;
	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
		zhp->zfs_type = ZFS_TYPE_VOLUME;
	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
		zhp->zfs_type = ZFS_TYPE_FILESYSTEM;
	else
		zhp->zfs_dmustats.dds_inconsistent = 1;

	if (zhp->zfs_dmustats.dds_inconsistent) {
		zfs_cmd_t zc = { 0 };

	}

	/*
	 * We've managed to open the dataset and gather statistics.  Determine
	 * the high-level type.
	 */
	if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
		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
		abort();

	if (zhp->zfs_dmustats.dds_is_snapshot)
		zhp->zfs_type = ZFS_TYPE_SNAPSHOT;
	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
		zhp->zfs_type = ZFS_TYPE_VOLUME;
	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
		zhp->zfs_type = ZFS_TYPE_FILESYSTEM;
	else
		abort();	/* we should never see any other types */

	zhp->zfs_hdl->libzfs_log_str = logstr;
	zhp->zpool_hdl = zpool_handle(zhp);

Return to bug 160283

Lines 404-407 Link Here

(-)cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c (-20 / +20 lines)
404	}	404	}
405		405
		406	/*
		407	* We've managed to open the dataset and gather statistics. Determine
		408	* the high-level type.
		409	*/
		410	if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
		411	zhp->zfs_head_type = ZFS_TYPE_VOLUME;
		412	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
		413	zhp->zfs_head_type = ZFS_TYPE_FILESYSTEM;
		414	else
		415	zhp->zfs_dmustats.dds_inconsistent = 1;
		416
		417	if (zhp->zfs_dmustats.dds_is_snapshot)
		418	zhp->zfs_type = ZFS_TYPE_SNAPSHOT;
		419	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
		420	zhp->zfs_type = ZFS_TYPE_VOLUME;
		421	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
		422	zhp->zfs_type = ZFS_TYPE_FILESYSTEM;
		423	else
		424	zhp->zfs_dmustats.dds_inconsistent = 1;
		425
406	if (zhp->zfs_dmustats.dds_inconsistent) {	426	if (zhp->zfs_dmustats.dds_inconsistent) {
407	zfs_cmd_t zc = { 0 };	427	zfs_cmd_t zc = { 0 };
Lines 446-469 Link Here
446	}	466	}
447		467
448	/*
449	* We've managed to open the dataset and gather statistics. Determine
450	* the high-level type.
451	*/
452	if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
453	zhp->zfs_head_type = ZFS_TYPE_VOLUME;
454	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
455	zhp->zfs_head_type = ZFS_TYPE_FILESYSTEM;
456	else
457	abort();
458
459	if (zhp->zfs_dmustats.dds_is_snapshot)
460	zhp->zfs_type = ZFS_TYPE_SNAPSHOT;
461	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
462	zhp->zfs_type = ZFS_TYPE_VOLUME;
463	else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
464	zhp->zfs_type = ZFS_TYPE_FILESYSTEM;
465	else
466	abort(); /* we should never see any other types */
467
468	zhp->zfs_hdl->libzfs_log_str = logstr;	468	zhp->zfs_hdl->libzfs_log_str = logstr;
469	zhp->zpool_hdl = zpool_handle(zhp);	469	zhp->zpool_hdl = zpool_handle(zhp);