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

Commit 56d7fcfa authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] iscsi class, libiscsi and qla4xxx: convert to new transport host byte values 



This patch converts the iscsi drivers to the new host byte values.

v2
Drop some conversions. Want to avoid conflicts with other patches.
v1
initial patch.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a4dfaa6f

drivers/scsi/libiscsi.c

+5 −3
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) 
			goto reject;

		case ISCSI_STATE_RECOVERY_FAILED:

			reason = FAILURE_SESSION_RECOVERY_TIMEOUT;

			sc->result = DID_NO_CONNECT << 16;

			sc->result = DID_TRANSPORT_FAILFAST << 16;

			break;

		case ISCSI_STATE_TERMINATE:

			reason = FAILURE_SESSION_TERMINATE;
@@ -2333,8 +2333,10 @@ static void iscsi_start_session_recovery(struct iscsi_session *session, 
	 * flush queues.

	 */

	spin_lock_bh(&session->lock);

	fail_all_commands(conn, -1,

			STOP_CONN_RECOVER ? DID_BUS_BUSY : DID_ERROR);

	if (STOP_CONN_RECOVER)

		fail_all_commands(conn, -1, DID_TRANSPORT_DISRUPTED);

	else

		fail_all_commands(conn, -1, DID_ERROR);

	flush_control_queues(session, conn);

	spin_unlock_bh(&session->lock);

	mutex_unlock(&session->eh_mutex);

drivers/scsi/qla4xxx/ql4_isr.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha, 
			      ha->host_no, cmd->device->channel,

			      cmd->device->id, cmd->device->lun));



		cmd->result = DID_BUS_BUSY << 16;

		cmd->result = DID_TRANSPORT_DISRUPTED << 16;



		/*

		 * Mark device missing so that we won't continue to send
@@ -243,7 +243,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha, 
		if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE)

			qla4xxx_mark_device_missing(ha, ddb_entry);



		cmd->result = DID_BUS_BUSY << 16;

		cmd->result = DID_TRANSPORT_DISRUPTED << 16;

		break;



	case SCS_QUEUE_FULL:

drivers/scsi/scsi_transport_iscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -374,10 +374,10 @@ int iscsi_session_chkready(struct iscsi_cls_session *session) 
		err = 0;

		break;

	case ISCSI_SESSION_FAILED:

		err = DID_IMM_RETRY << 16;

		err = DID_TRANSPORT_DISRUPTED << 16;

		break;

	case ISCSI_SESSION_FREE:

		err = DID_NO_CONNECT << 16;

		err = DID_TRANSPORT_FAILFAST << 16;

		break;

	default:

		err = DID_NO_CONNECT << 16;