X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fspa.c;h=b397a19b3fc625854602d03ba90e17fe3a7fa712;hb=c65aa5b2b9c48375ea1c451f252f0056e16f4e49;hp=9ae16d316367da89dc36ae5048426b54753ba876;hpb=d6320ddb78fa89c4d0fc2af00ae53c7c70992f96;p=zfs.git

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 9ae16d3..b397a19 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -271,8 +271,8 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
 
 				dp = spa_get_dsl(spa);
 				rw_enter(&dp->dp_config_rwlock, RW_READER);
-				if (err = dsl_dataset_hold_obj(dp,
-				    za.za_first_integer, FTAG, &ds)) {
+				if ((err = dsl_dataset_hold_obj(dp,
+				    za.za_first_integer, FTAG, &ds))) {
 					rw_exit(&dp->dp_config_rwlock);
 					break;
 				}
@@ -398,7 +398,7 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
 					break;
 				}
 
-				if (error = dmu_objset_hold(strval, FTAG, &os))
+				if ((error = dmu_objset_hold(strval,FTAG,&os)))
 					break;
 
 				/* Must be ZPL and not gzip compressed. */
@@ -471,6 +471,9 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
 			    intval != 0 && intval < ZIO_DEDUPDITTO_MIN)
 				error = EINVAL;
 			break;
+
+		default:
+			break;
 		}
 
 		if (error)
@@ -1425,6 +1428,8 @@ static int
 spa_check_logs(spa_t *spa)
 {
 	switch (spa->spa_log_state) {
+	default:
+		break;
 	case SPA_LOG_MISSING:
 		/* need to recheck in case slog has been restored */
 	case SPA_LOG_UNKNOWN:
@@ -2166,7 +2171,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
 	 * to start pushing transactions.
 	 */
 	if (state != SPA_LOAD_TRYIMPORT) {
-		if (error = spa_load_verify(spa))
+		if ((error = spa_load_verify(spa)))
 			return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA,
 			    error));
 	}
@@ -5591,7 +5596,7 @@ spa_sync(spa_t *spa, uint64_t txg)
 		ddt_sync(spa, txg);
 		dsl_scan_sync(dp, tx);
 
-		while (vd = txg_list_remove(&spa->spa_vdev_txg_list, txg))
+		while ((vd = txg_list_remove(&spa->spa_vdev_txg_list, txg)))
 			vdev_sync(vd, txg);
 
 		if (pass == 1)
@@ -5673,7 +5678,7 @@ spa_sync(spa_t *spa, uint64_t txg)
 	/*
 	 * Update usable space statistics.
 	 */
-	while (vd = txg_list_remove(&spa->spa_vdev_txg_list, TXG_CLEAN(txg)))
+	while ((vd = txg_list_remove(&spa->spa_vdev_txg_list, TXG_CLEAN(txg))))
 		vdev_sync_done(vd, txg);
 
 	spa_update_dspace(spa);