openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] clean up scsi_times_out 

Make sure the control flow in scsi_times_out makes sense.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Christoph Hellwig 2008-11-05 15:03:15 +01:00 committed by James Bottomley
parent 327d0c7d89
commit fa9907810b
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/scsi/scsi_error.c
View File

@ -124,34 +124,22 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)
enum blk_eh_timer_return scsi_times_out(struct request *req) enum blk_eh_timer_return scsi_times_out(struct request *req)
{ {
struct scsi_cmnd *scmd = req->special; struct scsi_cmnd *scmd = req->special;
enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *);
enum blk_eh_timer_return rtn = BLK_EH_NOT_HANDLED; enum blk_eh_timer_return rtn = BLK_EH_NOT_HANDLED;
scsi_log_completion(scmd, TIMEOUT_ERROR); scsi_log_completion(scmd, TIMEOUT_ERROR);
if (scmd->device->host->transportt->eh_timed_out) if (scmd->device->host->transportt->eh_timed_out)
eh_timed_out = scmd->device->host->transportt->eh_timed_out; rtn = scmd->device->host->transportt->eh_timed_out(scmd);
else if (scmd->device->host->hostt->eh_timed_out) else if (scmd->device->host->hostt->eh_timed_out)
eh_timed_out = scmd->device->host->hostt->eh_timed_out; rtn = scmd->device->host->hostt->eh_timed_out(scmd);
else
eh_timed_out = NULL;
if (eh_timed_out) { if (unlikely(rtn == BLK_EH_NOT_HANDLED &&
rtn = eh_timed_out(scmd); !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
switch (rtn) {
case BLK_EH_NOT_HANDLED:
break;
default:
return rtn;
}
}
if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
scmd->result |= DID_TIME_OUT << 16; scmd->result |= DID_TIME_OUT << 16;
return BLK_EH_HANDLED; rtn = BLK_EH_HANDLED;
} }
return BLK_EH_NOT_HANDLED; return rtn;
} }
/** /**