[PATCH 2/11] opensm/osm_pkey_mgr.c: Move clearing of empty_block after any "early" returns

[PATCH 2/11] opensm/osm_pkey_mgr.c: Move clearing of empty_block after any "early" returns

[Hal Rosenstock]

Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
diff --git a/opensm/osm_pkey_mgr.c b/opensm/osm_pkey_mgr.c
index 612130c..ce50f27 100644
--- a/opensm/osm_pkey_mgr.c
+++ b/opensm/osm_pkey_mgr.c
@@ -263,12 +263,12 @@ static int pkey_mgr_update_port(osm_log_t * p_log,
osm_sm_t * sm,
 	ib_pkey_table_t empty_block;
 	int ret = 0;

-	memset(&empty_block, 0, sizeof(ib_pkey_table_t));
-
 	p_physp = p_port->p_physp;
 	if (!p_physp)
 		return FALSE;

+	memset(&empty_block, 0, sizeof(ib_pkey_table_t));
+
 	p_node = osm_physp_get_node_ptr(p_physp);
 	p_pkey_tbl = &p_physp->pkeys;
 	num_of_blocks = osm_pkey_tbl_get_num_blocks(p_pkey_tbl);
@@ -392,8 +392,6 @@ static int pkey_mgr_update_peer_port(osm_log_t *
p_log, osm_sm_t * sm,
 	ib_pkey_table_t empty_block;
 	int ret = 0;

-	memset(&empty_block, 0, sizeof(ib_pkey_table_t));
-
 	p_physp = p_port->p_physp;
 	if (!p_physp)
 		return -1;
@@ -426,6 +424,8 @@ static int pkey_mgr_update_peer_port(osm_log_t *
p_log, osm_sm_t * sm,
 	if (enforce == FALSE)
 		return ret;

+	memset(&empty_block, 0, sizeof(ib_pkey_table_t));
+
 	p_peer_pkey_tbl->used_blocks = p_pkey_tbl->used_blocks;
 	for (block_index = 0; block_index < p_pkey_tbl->used_blocks;
 	     block_index++) {
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html