first round of fixes and modifications after review

openzfs · Feb 10, 2017 · c4daa03 · c4daa03
1 parent ee782bc
commit c4daa03
Show file tree

Hide file tree

Showing 71 changed files with 2,816 additions and 1,644 deletions.
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -2489,7 +2489,7 @@ dump_one_dir(const char *dsname, void *arg)
 	}
 
 	dump_dir(os);
-	dmu_objset_disown(os, FTAG);
+	dmu_objset_disown(os, B_FALSE, FTAG);
 	fuid_table_destroy();
 	sa_loaded = B_FALSE;
 	return (0);
@@ -4122,7 +4122,10 @@ main(int argc, char **argv)
 			zdb_read_block(argv[i], spa);
 	}
 
-	(os != NULL) ? dmu_objset_disown(os, FTAG) : spa_close(spa, FTAG);
+	if (os != NULL)
+		dmu_objset_disown(os, B_FALSE, FTAG);
+	else
+		spa_close(spa, FTAG);
 
 	fuid_table_destroy();
 	sa_loaded = B_FALSE;

diff --git a/cmd/zed/agents/zfs_mod.c b/cmd/zed/agents/zfs_mod.c
@@ -506,7 +506,7 @@ zfs_enable_ds(void *arg)
 
 	assert(pool->uap_enable_tid = pthread_self());
 
-	(void) zpool_enable_datasets(pool->uap_zhp, NULL, 0, B_FALSE);
+	(void) zpool_enable_datasets(pool->uap_zhp, NULL, 0);
 	zpool_close(pool->uap_zhp);
 	pool->uap_zhp = NULL;