Commit 80f82c16 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: sd: Remove superfluous residual assignments 



Since commit 26e85fcd ("[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: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 229531be

drivers/scsi/sd.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE