|
@@ -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
|
|
* for a requeue after completion, which should only occur in this
|
|
* file.
|
|
* 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 scsi_device *device = cmd->device;
|
|
struct request_queue *q = device->request_queue;
|
|
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)
|
|
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;
|
|
break;
|
|
case ACTION_RETRY:
|
|
case ACTION_RETRY:
|
|
/* Retry the same command immediately */
|
|
/* Retry the same command immediately */
|
|
- __scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY, 0);
|
|
|
|
|
|
+ __scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY, false);
|
|
break;
|
|
break;
|
|
case ACTION_DELAYED_RETRY:
|
|
case ACTION_DELAYED_RETRY:
|
|
/* Retry the same command after a delay */
|
|
/* 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;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|