From: Christoph Hellwig <hch@lst.de>
Date: Sat, 28 Jun 2014 14:18:59 +0000 (+0200)
Subject: sd: retry discard commands
X-Git-Tag: v3.17-rc1~100^2~96
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e4200f8ee35db820680a3caa25d260ef11fc1462;p=linux.git

sd: retry discard commands

Currently cmd->allowed is initialized from rq->retries for discard
commands, but retries is always 0 for non-BLOCK_PC requests.  Set it
to the standard number of retries instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index f54a53086c9d..fe0b7dff02b4 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -758,7 +758,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
 	rq->timeout = SD_TIMEOUT;
 
 	cmd->transfersize = len;
-	cmd->allowed = rq->retries;
+	cmd->allowed = SD_MAX_RETRIES;
 
 	/*
 	 * Initially __data_len is set to the amount of data that needs to be