diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index ddcc6fdc53..d1cd9d5307 100644
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -1044,7 +1044,7 @@ dmu_objset_do_userquota_callbacks(objset_impl_t *os, dmu_tx_t *tx)
 
 	ASSERT(list_head(list) == NULL || dmu_objset_userused_enabled(os));
 
-	while (dn = list_head(list)) {
+	while ((dn = list_head(list))) {
 		dmu_object_type_t bonustype;
 
 		ASSERT(!DMU_OBJECT_IS_SPECIAL(dn->dn_object));
diff --git a/module/zfs/dsl_prop.c b/module/zfs/dsl_prop.c
index 9bc1226743..c26c3ff270 100644
--- a/module/zfs/dsl_prop.c
+++ b/module/zfs/dsl_prop.c
@@ -510,7 +510,7 @@ dsl_props_set(const char *dsname, nvlist_t *nvl)
 	nvpair_t *elem = NULL;
 	int err;
 
-	if (err = dsl_dataset_hold(dsname, FTAG, &ds))
+	if ((err = dsl_dataset_hold(dsname, FTAG, &ds)))
 		return (err);
 	/*
 	 * Do these checks before the syncfunc, since it can't fail.