[SCSI] qla2xxx: Stop iteration after first failure in *_id functions.
Arun Easi [Thu, 9 Feb 2012 19:16:00 +0000 (11:16 -0800)]
Signed-off-by: Arun Easi <arun.easi@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

drivers/scsi/qla2xxx/qla_gs.c

index bf89e6c..3128f80 100644 (file)
@@ -371,9 +371,11 @@ qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)
                        /*EMPTY*/
                        ql_dbg(ql_dbg_disc, vha, 0x2056,
                            "GPN_ID issue IOCB failed (%d).\n", rval);
+                       break;
                } else if (qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp,
                    "GPN_ID") != QLA_SUCCESS) {
                        rval = QLA_FUNCTION_FAILED;
+                       break;
                } else {
                        /* Save portname */
                        memcpy(list[i].port_name,
@@ -431,9 +433,11 @@ qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)
                        /*EMPTY*/
                        ql_dbg(ql_dbg_disc, vha, 0x2057,
                            "GNN_ID issue IOCB failed (%d).\n", rval);
+                       break;
                } else if (qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp,
                    "GNN_ID") != QLA_SUCCESS) {
                        rval = QLA_FUNCTION_FAILED;
+                       break;
                } else {
                        /* Save nodename */
                        memcpy(list[i].node_name,
@@ -1777,9 +1781,11 @@ qla2x00_gfpn_id(scsi_qla_host_t *vha, sw_info_t *list)
                        /*EMPTY*/
                        ql_dbg(ql_dbg_disc, vha, 0x2023,
                            "GFPN_ID issue IOCB failed (%d).\n", rval);
+                       break;
                } else if (qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp,
                    "GFPN_ID") != QLA_SUCCESS) {
                        rval = QLA_FUNCTION_FAILED;
+                       break;
                } else {
                        /* Save fabric portname */
                        memcpy(list[i].fabric_port_name,