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

Commit 08640e81 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: core: Change third __scsi_queue_insert() argument from int to bool 



This patch does not change any functionality but makes the SCSI core
source code slightly easier to read.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cfc350ab

drivers/scsi/scsi_lib.c

+4 −4
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void scsi_mq_requeue_cmd(struct scsi_cmnd *cmd) 
 * for a requeue after completion, which should only occur in this

 * file.

 */

static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)

static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, bool unbusy)

{

	struct scsi_device *device = cmd->device;

	struct request_queue *q = device->request_queue;
@@ -220,7 +220,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy) 
 */

void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)

{

	__scsi_queue_insert(cmd, reason, 1);

	__scsi_queue_insert(cmd, reason, true);

}
@@ -1015,11 +1015,11 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
		break;

	case ACTION_RETRY:

		/* Retry the same command immediately */

		__scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY, 0);

		__scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY, false);

		break;

	case ACTION_DELAYED_RETRY:

		/* Retry the same command after a delay */

		__scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY, 0);

		__scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY, false);

		break;

	}

}