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

diff --git a/module/zfs/sa.c b/module/zfs/sa.c
index d5c985b..f94b6ac 100644
--- a/module/zfs/sa.c
+++ b/module/zfs/sa.c
@@ -398,6 +398,8 @@ sa_attr_op(sa_handle_t *hdl, sa_bulk_attr_t *bulk, int count,
 			if (error)
 				return (error);
 			break;
+		default:
+			break;
 		}
 	}
 	return (error);
@@ -1103,16 +1105,16 @@ sa_tear_down(objset_t *os)
 	sa_free_attr_table(sa);
 
 	cookie = NULL;
-	while (layout = avl_destroy_nodes(&sa->sa_layout_hash_tree, &cookie)) {
+	while ((layout = avl_destroy_nodes(&sa->sa_layout_hash_tree, &cookie))){
 		sa_idx_tab_t *tab;
-		while (tab = list_head(&layout->lot_idx_tab)) {
+		while ((tab = list_head(&layout->lot_idx_tab))) {
 			ASSERT(refcount_count(&tab->sa_refcount));
 			sa_idx_tab_rele(os, tab);
 		}
 	}
 
 	cookie = NULL;
-	while (layout = avl_destroy_nodes(&sa->sa_layout_num_tree, &cookie)) {
+	while ((layout = avl_destroy_nodes(&sa->sa_layout_num_tree, &cookie))){
 		kmem_free(layout->lot_attrs,
 		    sizeof (sa_attr_type_t) * layout->lot_attr_count);
 		kmem_free(layout, sizeof (sa_lot_t));
@@ -1385,7 +1387,7 @@ sa_handle_get(objset_t *objset, uint64_t objid, void *userp,
 	dmu_buf_t *db;
 	int error;
 
-	if (error = dmu_bonus_hold(objset, objid, NULL, &db))
+	if ((error = dmu_bonus_hold(objset, objid, NULL, &db)))
 		return (error);
 
 	return (sa_handle_get_from_db(objset, db, userp, hdl_type,
@@ -1545,12 +1547,12 @@ sa_attr_register_sync(sa_handle_t *hdl, dmu_tx_t *tx)
 
 	mutex_enter(&sa->sa_lock);
 
-	if (!sa->sa_need_attr_registration || sa->sa_master_obj == NULL) {
+	if (!sa->sa_need_attr_registration || sa->sa_master_obj == 0) {
 		mutex_exit(&sa->sa_lock);
 		return;
 	}
 
-	if (sa->sa_reg_attr_obj == NULL) {
+	if (sa->sa_reg_attr_obj == 0) {
 		sa->sa_reg_attr_obj = zap_create(hdl->sa_os,
 		    DMU_OT_SA_ATTR_REGISTRATION, DMU_OT_NONE, 0, tx);
 		VERIFY(zap_add(hdl->sa_os, sa->sa_master_obj,