scsi: core: Add a helper for retry scsi cmnd
PATCH 1/1 scsi: core: Add a helper for retry scsi cmnd
From: Wu Bo <[email protected]>
Without any functional modifications,
just adding a helper function for retry scsi cmnd.
Signed-off-by Wu Bo <[email protected]>
--- drivers/scsi/scsi_error.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/scsi/scsi_error.c +12 -5
@@ -133,6 +133,16 @@ static bool scsi_eh_should_retry_cmd(struct scsi_cmnd *cmd)return true; } +static bool scsi_need_retry_cmd (struct scsi_cmnd *scmd) +{ +if (!scsi_noretry_cmd (scmd) && +scsi_cmd_retry_allowed (scmd) && +scsi_eh_should_retry_cmd (scmd)) +return true; + +return false; +} +/** * scmd_eh_abort_handler - Handle command aborts * @work: command to be aborted.
@@ -195,9 +205,7 @@ scmd_eh_abort_handler(struct work_struct *work)spin_unlock_irqrestore (shost->host_lock, flags); -if (!scsi_noretry_cmd (scmd) && -scsi_cmd_retry_allowed (scmd) && -scsi_eh_should_retry_cmd (scmd)) { +if (scsi_need_retry_cmd (scmd)) {SCSI_LOG_ERROR_RECOVERY (3 ,scmd_printk (KERN_WARNING , scmd,"retry aborted command\n" ));
@@ -2149,8 +2157,7 @@ void scsi_eh_flush_done_q(struct list_head *done_q)list_for_each_entry_safe (scmd, next, done_q, eh_entry) {list_del_init (&scmd->eh_entry);if (scsi_device_online (scmd->device) && - !scsi_noretry_cmd (scmd) &&scsi_cmd_retry_allowed (scmd) && -scsi_eh_should_retry_cmd (scmd)) { +scsi_need_retry_cmd (scmd)) { SCSI_LOG_ERROR_RECOVERY(3, scmd_printk(KERN_INFO, scmd, "%s: flush retry cmd\n",
Signature · 1 line
2.33.0