Mercurial > illumos > illumos-gate

changeset 914:b027be85f18b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6349703 "origin" property not set for cloned volumes 6346724 The ZFS GUI implies that compression is turned 'on' for a pool when it is actually 'off'
author lling
date Mon, 14 Nov 2005 18:06:55 -0800
parents e99aef503251
children 59467ba2e2b3
files usr/src/common/zfs/zfs_prop.c usr/src/common/zfs/zfs_prop.h
diffstat 2 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/common/zfs/zfs_prop.c	Mon Nov 14 16:54:46 2005 -0800
+++ b/usr/src/common/zfs/zfs_prop.c	Mon Nov 14 18:06:55 2005 -0800
@@ -98,7 +98,8 @@
 	{ "mounted",	prop_type_boolean,	0,	NULL,	prop_readonly,
 	    ZFS_TYPE_FILESYSTEM, "yes | no | -", "MOUNTED", "%7s" },
 	{ "origin",	prop_type_string,	0,	NULL,	prop_readonly,
-	    ZFS_TYPE_FILESYSTEM, "<snapshot>", "ORIGIN", "%-20s" },
+	    ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<snapshot>", "ORIGIN",
+	    "%-20s" },
 	{ "quota",	prop_type_number,	0,	NULL,	prop_default,
 	    ZFS_TYPE_FILESYSTEM, "<size> | none", "QUOTA", "%5s" },
 	{ "reservation", prop_type_number,	0,	NULL,	prop_default,
@@ -118,10 +119,10 @@
 	{ "sharenfs",	prop_type_string,	0,	"off",	prop_inherit,
 	    ZFS_TYPE_FILESYSTEM,
 	    "on | off | share(1M) options", "SHARENFS", "%-15s" },
-	{ "checksum",	prop_type_index,	ZIO_CHECKSUM_DEFAULT,	NULL,
+	{ "checksum",	prop_type_index,	ZIO_CHECKSUM_DEFAULT,	"on",
 	    prop_inherit,	ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
 	    "on | off | fletcher2 | fletcher4 | sha256", "CHECKSUM", "%10s" },
-	{ "compression", prop_type_index,	ZIO_COMPRESS_DEFAULT,	NULL,
+	{ "compression", prop_type_index,	ZIO_COMPRESS_DEFAULT,	"off",
 	    prop_inherit,	ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
 	    "on | off | lzjb", "COMPRESS", "%8s" },
 	{ "atime",	prop_type_boolean,	1,	NULL,	prop_inherit,
@@ -141,14 +142,14 @@
 	{ "zoned",	prop_type_boolean,	0,	NULL,	prop_inherit,
 	    ZFS_TYPE_FILESYSTEM,
 	    "on | off", "ZONED", "%5s" },
-	{ "snapdir",	prop_type_index,	ZFS_SNAPDIR_VISIBLE,	NULL,
+	{ "snapdir",	prop_type_index,	ZFS_SNAPDIR_VISIBLE, "visible",
 	    prop_inherit,
 	    ZFS_TYPE_FILESYSTEM,
 	    "hidden | visible", "SNAPDIR", "%7s" },
-	{ "aclmode", prop_type_index,	GROUPMASK,	 NULL,	prop_inherit,
+	{ "aclmode", prop_type_index,	GROUPMASK, "groupmask", prop_inherit,
 	    ZFS_TYPE_FILESYSTEM,
 	    "discard | groupmask | passthrough", "ACLMODE", "%11s" },
-	{ "aclinherit", prop_type_index,	SECURE,	NULL, 	prop_inherit,
+	{ "aclinherit", prop_type_index,	SECURE,	"secure", prop_inherit,
 	    ZFS_TYPE_FILESYSTEM,
 	    "discard | noallow | secure | passthrough", "ACLINHERIT", "%11s" },
 	{ "createtxg",	prop_type_number,	0,	NULL,	prop_readonly,
@@ -191,17 +192,7 @@
 void
 zfs_prop_default_string(zfs_prop_t prop, char *buf, size_t buflen)
 {
-	/*
-	 * For index types (compression and checksum), we want the numeric value
-	 * in the kernel, but the string value in userland.  The kernel will
-	 * call zfs_prop_default_numeric() based on the property type.  In
-	 * userland, the zfs_prop_is_string() will return TRUE for index types,
-	 * and we'll return "on" from this function.
-	 */
-	if (zfs_prop_table[prop].pd_proptype == prop_type_index)
-		(void) strncpy(buf, "on", buflen);
-	else
-		(void) strncpy(buf, zfs_prop_table[prop].pd_strdefault, buflen);
+	(void) strncpy(buf, zfs_prop_table[prop].pd_strdefault, buflen);
 }
 
 uint64_t
--- a/usr/src/common/zfs/zfs_prop.h	Mon Nov 14 16:54:46 2005 -0800
+++ b/usr/src/common/zfs/zfs_prop.h	Mon Nov 14 18:06:55 2005 -0800
@@ -36,6 +36,10 @@
 extern "C" {
 #endif
 
+/*
+ * For index types (e.g. compression and checksum), we want the numeric value
+ * in the kernel, but the string value in userland.
+ */
 typedef enum {
 	prop_type_number,	/* numeric value */
 	prop_type_string,	/* string value */