hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] add retries field to request for REQ_BLOCK_PC use 

For tape we need to control the retries. This patch adds a retries
counter on the request for REQ_BLOCK_PC commands originating from
scsi_execute* to use. REQ_BLOCK_PC commands comming from the block
layer SG_IO path continue to use the retires set in the ULD init_command.
(scsi_execute* does not set the gendisk so we do not execute
the init_command in that path).

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Mike Christie 2005-11-11 05:31:37 -06:00 committed by James Bottomley
parent 6e68af666f
commit 17e01f216b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/scsi_lib.c
View File

@ -259,6 +259,7 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
memcpy(req->cmd, cmd, req->cmd_len); memcpy(req->cmd, cmd, req->cmd_len);
req->sense = sense; req->sense = sense;
req->sense_len = 0; req->sense_len = 0;
req->retries = retries;
req->timeout = timeout; req->timeout = timeout;
req->flags |= flags | REQ_BLOCK_PC | REQ_SPECIAL | REQ_QUIET; req->flags |= flags | REQ_BLOCK_PC | REQ_SPECIAL | REQ_QUIET;
@ -472,6 +473,7 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
req->sense = sioc->sense; req->sense = sioc->sense;
req->sense_len = 0; req->sense_len = 0;
req->timeout = timeout; req->timeout = timeout;
req->retries = retries;
req->flags |= REQ_BLOCK_PC | REQ_QUIET; req->flags |= REQ_BLOCK_PC | REQ_QUIET;
req->end_io_data = sioc; req->end_io_data = sioc;
@ -1393,7 +1395,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
cmd->sc_data_direction = DMA_NONE; cmd->sc_data_direction = DMA_NONE;
cmd->transfersize = req->data_len; cmd->transfersize = req->data_len;
cmd->allowed = 3; cmd->allowed = req->retries;
cmd->timeout_per_command = req->timeout; cmd->timeout_per_command = req->timeout;
cmd->done = scsi_generic_done; cmd->done = scsi_generic_done;
} }

1
include/linux/blkdev.h
View File

@ -184,6 +184,7 @@ struct request {
void *sense; void *sense;
unsigned int timeout; unsigned int timeout;
int retries;
/* /*
* For Power Management requests * For Power Management requests