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

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

[SCSI] libiscsi: Use SCSI_MLQUEUE_TARGET_BUSY 



For the conditions below we do not want the queuecommand
function to call us right back, so return SCSI_MLQUEUE_TARGET_BUSY.

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

drivers/scsi/libiscsi.c

+3 −5
Original line number Diff line number Diff line
@@ -1194,12 +1194,10 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) 
		switch (session->state) {

		case ISCSI_STATE_IN_RECOVERY:

			reason = FAILURE_SESSION_IN_RECOVERY;

			sc->result = DID_IMM_RETRY << 16;

			break;

			goto reject;

		case ISCSI_STATE_LOGGING_OUT:

			reason = FAILURE_SESSION_LOGGING_OUT;

			sc->result = DID_IMM_RETRY << 16;

			break;

			goto reject;

		case ISCSI_STATE_RECOVERY_FAILED:

			reason = FAILURE_SESSION_RECOVERY_TIMEOUT;

			sc->result = DID_NO_CONNECT << 16;
@@ -1267,7 +1265,7 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) 
	spin_unlock(&session->lock);

	debug_scsi("cmd 0x%x rejected (%d)\n", sc->cmnd[0], reason);

	spin_lock(host->host_lock);

	return SCSI_MLQUEUE_HOST_BUSY;

	return SCSI_MLQUEUE_TARGET_BUSY;



fault:

	spin_unlock(&session->lock);