]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
scsi: sd: Remove a local variable
authorBart Van Assche <bvanassche@acm.org>
Wed, 16 Jan 2019 00:49:57 +0000 (16:49 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 23 Jan 2019 02:18:27 +0000 (21:18 -0500)
This patch does not change any functionality.

Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
[ bvanassche: extracted this patch from a larger patch ]
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/sd.c

index c6ca3d9159258c1bb3398fc5711fa8c3cca3cdf2..a60b98681f1523469843901631cb44c6da140b82 100644 (file)
@@ -1015,7 +1015,6 @@ static blk_status_t sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
        struct bio *bio = rq->bio;
        sector_t sector = blk_rq_pos(rq);
        unsigned int nr_sectors = blk_rq_sectors(rq);
-       unsigned int nr_bytes = blk_rq_bytes(rq);
        blk_status_t ret;
 
        if (sdkp->device->no_write_same)
@@ -1055,7 +1054,7 @@ static blk_status_t sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
         */
        rq->__data_len = sdp->sector_size;
        ret = scsi_init_io(cmd);
-       rq->__data_len = nr_bytes;
+       rq->__data_len = blk_rq_bytes(rq);
 
        return ret;
 }