Attachment 118115 Details for Bug 160283 – file.diff

[patch] file.diff

file.diff (text/plain), 1.68 KB, created by Stef Walter on 2011-08-29 17:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2011-08-29 17:00:24 UTC

Size: 1.68 KB

patch

obsolete

>--- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c.orig	2011-01-10 22:29:45.000000000 +0000
>+++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	2011-01-12 01:49:13.000000000 +0000
>@@ -404,4 +404,24 @@
> 	}
> 
>+	/*
>+	 * 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 };
>@@ -446,24 +466,4 @@
> 	}
> 
>-	/*
>-	 * 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);

Actions: View | Diff

Attachments on bug 160283: 118115