scsi: sd: Remove superfluous residual assignments

Since commit 26e85fcd15f6 ("[SCSI] sd: Permit merged discard requests";
kernel v3.10) sd_done() sets the residual not only for failed special
requests but also for special requests that succeeded. Hence remove the
code from functions called by sd_init_command() that sets the residual.
This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index c124459041dc67bafc47c8f8c6cab0d3e27cf1c3..cc175b78b366df84fd6b17c2b2c1cba8d866a8e1 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -843,7 +843,6 @@ static blk_status_t sd_setup_unmap_cmnd(struct scsi_cmnd *cmd)
        cmd->allowed = SD_MAX_RETRIES;
        cmd->transfersize = data_len;
        rq->timeout = SD_TIMEOUT;
-       scsi_req(rq)->resid_len = data_len;
 
        return scsi_init_io(cmd);
 }
@@ -875,7 +874,6 @@ static blk_status_t sd_setup_write_same16_cmnd(struct scsi_cmnd *cmd,
        cmd->allowed = SD_MAX_RETRIES;
        cmd->transfersize = data_len;
        rq->timeout = unmap ? SD_TIMEOUT : SD_WRITE_SAME_TIMEOUT;
-       scsi_req(rq)->resid_len = data_len;
 
        return scsi_init_io(cmd);
 }
@@ -907,7 +905,6 @@ static blk_status_t sd_setup_write_same10_cmnd(struct scsi_cmnd *cmd,
        cmd->allowed = SD_MAX_RETRIES;
        cmd->transfersize = data_len;
        rq->timeout = unmap ? SD_TIMEOUT : SD_WRITE_SAME_TIMEOUT;
-       scsi_req(rq)->resid_len = data_len;
 
        return scsi_init_io(cmd);
 }