Build fixes

openzfs · Sep 26, 2018 · dfbacf0 · dfbacf0
1 parent 1727475
commit dfbacf0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/include/sys/dsl_bookmark.h b/include/sys/dsl_bookmark.h
@@ -63,7 +63,7 @@ typedef struct redaction_list {
 	redaction_list_phys_t	*rl_phys;
 	dmu_buf_t		*rl_dbuf;
 	uint64_t		rl_object;
-	refcount_t		rl_longholds;
+	zfs_refcount_t		rl_longholds;
 	objset_t		*rl_mos;
 } redaction_list_t;
 

diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
@@ -1246,6 +1246,7 @@ send_traverse_thread(void *arg)
 	thread_exit();
 }
 
+#ifdef ZFS_DEBUG
 /*
  * Utility function that causes End of Stream records to compare after of all
  * others, so that other threads' comparison logic can stay simple.
@@ -1291,6 +1292,7 @@ send_range_after(const struct send_range *from, const struct send_range *to)
 		return (1);
 	return (0);
 }
+#endif
 
 /*
  * Pop the new data off the queue, check that the records we receive are in
@@ -1301,7 +1303,7 @@ static struct send_range *
 get_next_range_nofree(bqueue_t *bq, struct send_range *prev)
 {
 	struct send_range *next = bqueue_dequeue(bq);
-	ASSERTv(send_range_after(prev, next) == -1);
+	ASSERT3S(send_range_after(prev, next), ==, -1);
 	return (next);
 }
 

diff --git a/module/zfs/dsl_bookmark.c b/module/zfs/dsl_bookmark.c
@@ -278,8 +278,8 @@ dsl_bookmark_node_add(dsl_dataset_t *hds, dsl_bookmark_node_t *dbn,
 	else if (dbn->dbn_phys.zbm_redaction_obj != 0)
 		bookmark_phys_size = offsetof(zfs_bookmark_phys_t, zbm_flags);
 
-	zfs_bookmark_phys_t zero_phys = { 0 };
-	ASSERTV(!bcmp(((char *)&dbn->dbn_phys) + bookmark_phys_size,
+	ASSERTV(zfs_bookmark_phys_t zero_phys = { 0 });
+	ASSERT0(bcmp(((char *)&dbn->dbn_phys) + bookmark_phys_size,
 	    &zero_phys, sizeof (zfs_bookmark_phys_t) - bookmark_phys_size));
 
 	VERIFY0(zap_add(mos, hds->ds_bookmarks_obj, dbn->dbn_name,
@@ -368,10 +368,10 @@ dsl_bookmark_create_sync_impl(const char *bookmark, const char *snapshot,
 static void
 dsl_bookmark_create_sync(void *arg, dmu_tx_t *tx)
 {
-	dsl_pool_t *dp = dmu_tx_pool(tx);
 	dsl_bookmark_create_arg_t *dbca = arg;
 
-	ASSERTV(spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_BOOKMARKS));
+	ASSERT(spa_feature_is_enabled(dmu_tx_pool(tx)->dp_spa,
+	    SPA_FEATURE_BOOKMARKS));
 
 	for (nvpair_t *pair = nvlist_next_nvpair(dbca->dbca_bmarks, NULL);
 	    pair != NULL; pair = nvlist_next_nvpair(dbca->dbca_bmarks, pair)) {
@@ -962,7 +962,7 @@ void
 dsl_redaction_list_long_hold(dsl_pool_t *dp, redaction_list_t *rl, void *tag)
 {
 	ASSERT(dsl_pool_config_held(dp));
-	(void) refcount_add(&rl->rl_longholds, tag);
+	(void) zfs_refcount_add(&rl->rl_longholds, tag);
 }
 
 void