]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
qla2xxx: Stop iteration after first failure in *_id functions.
authorArun Easi <arun.easi@qlogic.com>
Thu, 19 Jan 2012 20:59:41 +0000 (12:59 -0800)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 9 May 2012 00:40:59 +0000 (17:40 -0700)
JIRA Key: V2632FC-153

drivers/scsi/qla2xxx/qla_gs.c

index af2fcc0b15f8d733c7672a80eb7e6e47641b34a3..39fffc42dd05f87793f0c31edde15e2fb6a0887c 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,