Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dafdf892 authored Feb 09, 2012 by Arun Easi Committed by James Bottomley Feb 19, 2012

[SCSI] qla2xxx: Stop iteration after first failure in *_id functions.



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>

parent 98878a16

drivers/scsi/qla2xxx/qla_gs.c

+6 −0

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