Mercurial > illumos > illumos-gate

changeset 928:36d72fe4da29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6349314 dmu_object_type names incorrect for DSL Directories and DSL Datasets
author tabriz
date Tue, 15 Nov 2005 17:06:33 -0800
parents 9d181bf77293
children e9eba56e751c
files usr/src/uts/common/fs/zfs/dmu_traverse.c usr/src/uts/common/fs/zfs/dsl_dataset.c usr/src/uts/common/fs/zfs/dsl_dir.c usr/src/uts/common/fs/zfs/sys/dmu.h
diffstat 4 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/dmu_traverse.c	Tue Nov 15 14:19:14 2005 -0800
+++ b/usr/src/uts/common/fs/zfs/dmu_traverse.c	Tue Nov 15 17:06:33 2005 -0800
@@ -498,7 +498,7 @@
 		dsl_dataset_phys_t *dsp;
 
 		rc = get_dnode(th, 0, dn, &objset, &dn_tmp, 0,
-		    DMU_OT_DSL_OBJSET, ZB_MOS_CACHE);
+		    DMU_OT_DSL_DATASET, ZB_MOS_CACHE);
 
 		if (objset != zb->zb_objset)
 			rc = advance_objset(zseg, objset, th->th_advance);
--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c	Tue Nov 15 14:19:14 2005 -0800
+++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c	Tue Nov 15 17:06:33 2005 -0800
@@ -479,8 +479,8 @@
 	dd = dsl_dir_open_obj(dp, *ddobjp, NULL, FTAG);
 	ASSERT(dd != NULL);
 
-	dsobj = dmu_object_alloc(mos, DMU_OT_DSL_OBJSET, 0,
-	    DMU_OT_DSL_OBJSET, sizeof (dsl_dataset_phys_t), tx);
+	dsobj = dmu_object_alloc(mos, DMU_OT_DSL_DATASET, 0,
+	    DMU_OT_DSL_DATASET, sizeof (dsl_dataset_phys_t), tx);
 	dbuf = dmu_bonus_hold(mos, dsobj);
 	dmu_buf_will_dirty(dbuf, tx);
 	dsphys = dbuf->db_data;
@@ -542,8 +542,8 @@
 
 	/* This is the point of no (unsuccessful) return */
 
-	dsobj = dmu_object_alloc(mos, DMU_OT_DSL_OBJSET, 0,
-	    DMU_OT_DSL_OBJSET, sizeof (dsl_dataset_phys_t), tx);
+	dsobj = dmu_object_alloc(mos, DMU_OT_DSL_DATASET, 0,
+	    DMU_OT_DSL_DATASET, sizeof (dsl_dataset_phys_t), tx);
 	dbuf = dmu_bonus_hold(mos, dsobj);
 	dmu_buf_will_dirty(dbuf, tx);
 	dsphys = dbuf->db_data;
@@ -1215,8 +1215,8 @@
 
 	rw_enter(&dp->dp_config_rwlock, RW_WRITER);
 
-	dsobj = dmu_object_alloc(mos, DMU_OT_DSL_OBJSET, 0,
-	    DMU_OT_DSL_OBJSET, sizeof (dsl_dataset_phys_t), tx);
+	dsobj = dmu_object_alloc(mos, DMU_OT_DSL_DATASET, 0,
+	    DMU_OT_DSL_DATASET, sizeof (dsl_dataset_phys_t), tx);
 	dbuf = dmu_bonus_hold(mos, dsobj);
 	dmu_buf_will_dirty(dbuf, tx);
 	dsphys = dbuf->db_data;
--- a/usr/src/uts/common/fs/zfs/dsl_dir.c	Tue Nov 15 14:19:14 2005 -0800
+++ b/usr/src/uts/common/fs/zfs/dsl_dir.c	Tue Nov 15 17:06:33 2005 -0800
@@ -93,7 +93,7 @@
 	{
 		dmu_object_info_t doi;
 		dmu_object_info_from_db(dbuf, &doi);
-		ASSERT3U(doi.doi_type, ==, DMU_OT_DSL_DATASET);
+		ASSERT3U(doi.doi_type, ==, DMU_OT_DSL_DIR);
 	}
 #endif
 	/* XXX assert bonus buffer size is correct */
@@ -389,8 +389,8 @@
 		return (err ? err : EEXIST);
 	}
 
-	ddobj = dmu_object_alloc(mos, DMU_OT_DSL_DATASET, 0,
-	    DMU_OT_DSL_DATASET, sizeof (dsl_dir_phys_t), tx);
+	ddobj = dmu_object_alloc(mos, DMU_OT_DSL_DIR, 0,
+	    DMU_OT_DSL_DIR, sizeof (dsl_dir_phys_t), tx);
 	err = zap_add(mos, pds->dd_phys->dd_child_dir_zapobj,
 	    name, sizeof (uint64_t), 1, &ddobj, tx);
 	ASSERT3U(err, ==, 0);
@@ -505,8 +505,8 @@
 	dmu_buf_t *dbuf;
 	int error;
 
-	*ddobjp = dmu_object_alloc(mos, DMU_OT_DSL_DATASET, 0,
-	    DMU_OT_DSL_DATASET, sizeof (dsl_dir_phys_t), tx);
+	*ddobjp = dmu_object_alloc(mos, DMU_OT_DSL_DIR, 0,
+	    DMU_OT_DSL_DIR, sizeof (dsl_dir_phys_t), tx);
 
 	error = zap_add(mos, DMU_POOL_DIRECTORY_OBJECT, DMU_POOL_ROOT_DATASET,
 	    sizeof (uint64_t), 1, ddobjp, tx);
--- a/usr/src/uts/common/fs/zfs/sys/dmu.h	Tue Nov 15 14:19:14 2005 -0800
+++ b/usr/src/uts/common/fs/zfs/sys/dmu.h	Tue Nov 15 17:06:33 2005 -0800
@@ -80,11 +80,11 @@
 	DMU_OT_DNODE,			/* DNODE */
 	DMU_OT_OBJSET,			/* OBJSET */
 	/* dsl: */
-	DMU_OT_DSL_DATASET,		/* UINT64 */
+	DMU_OT_DSL_DIR,			/* UINT64 */
 	DMU_OT_DSL_DIR_CHILD_MAP,	/* ZAP */
 	DMU_OT_DSL_DS_SNAP_MAP,		/* ZAP */
 	DMU_OT_DSL_PROPS,		/* ZAP */
-	DMU_OT_DSL_OBJSET,		/* UINT64 */
+	DMU_OT_DSL_DATASET,		/* UINT64 */
 	/* zpl: */
 	DMU_OT_ZNODE,			/* ZNODE */
 	DMU_OT_ACL,			/* ACL */