aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin K. Petersen <[email protected]>2016-01-20 11:01:23 -0500
committerMartin K. Petersen <[email protected]>2016-01-20 19:51:34 -0500
commitd0eb20a863ba7dc1d3f4b841639671f134560be2 (patch)
tree8e51077d4f13bbb5548e8352a4fd64660e90289d
parentc142ce0d3c6b070c248cef4bbe3a0f58cfd61f3f (diff)
sd: Optimal I/O size is in bytes, not sectors
Commit ca369d51b3e1 ("block/sd: Fix device-imposed transfer length limits") accidentally switched optimal I/O size reporting from bytes to block layer sectors. Signed-off-by: Martin K. Petersen <[email protected]> Reported-by: Christian Borntraeger <[email protected]> Tested-by: Christian Borntraeger <[email protected]> Fixes: ca369d51b3e1649be4a72addd6d6a168cfb3f537 Cc: [email protected] # 4.4+ Reviewed-by: James E.J. Bottomley <[email protected]> Reviewed-by: Ewan D. Milne <[email protected]> Reviewed-by: Matthew R. Ochs <[email protected]>
-rw-r--r--drivers/scsi/sd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 4e08d1cd704d..ec163d08f6c3 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2893,7 +2893,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
rw_max = q->limits.io_opt =
- logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
+ sdkp->opt_xfer_blocks * sdp->sector_size;
else
rw_max = BLK_DEF_MAX_SECTORS;