This has get_sectorsize have scsi-ml retry errors instead of driving them
itself.
Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
Reviewed-by: Martin Wilck <mwilck@xxxxxxxx>
---
drivers/scsi/sr.c | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index e3171f040fe1..44f1b62a230d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -725,32 +725,31 @@ static int sr_probe(struct device *dev)
static void get_sectorsize(struct scsi_cd *cd)
{
- unsigned char cmd[10];
+ static const u8 cmd[10] = { READ_CAPACITY };
unsigned char buffer[8];
- int the_result, retries = 3;
+ int the_result;
int sector_size;
struct request_queue *queue;
+ struct scsi_failure failures[] = {
+ {
+ .result = SCMD_FAILURE_RESULT_ANY,
+ .allowed = 3,
+ },
+ {},
+ };
- do {
- cmd[0] = READ_CAPACITY;
- memset((void *) &cmd[1], 0, 9);
- memset(buffer, 0, sizeof(buffer));
-
- /* Do the command and wait.. */
- the_result = scsi_exec_req(((struct scsi_exec_args) {
- .sdev = cd->device,
- .cmd = cmd,
- .data_dir = DMA_FROM_DEVICE,
- .buf = buffer,
- .buf_len = sizeof(buffer),
- .timeout = SR_TIMEOUT,
- .retries = MAX_RETRIES }));
-
- retries--;
-
- } while (the_result && retries);
-
+ memset(buffer, 0, sizeof(buffer));
+ /* Do the command and wait.. */
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = cd->device,
+ .cmd = cmd,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = sizeof(buffer),
+ .timeout = SR_TIMEOUT,
+ .retries = MAX_RETRIES,
+ .failures = failures }));
if (the_result) {
cd->capacity = 0x1fffff;
sector_size = 2048; /* A guess, just in case */
--
2.25.1
