Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

This commit is contained in:
James Bottomley
2016-01-26 17:44:42 -08:00
2 changed files with 3 additions and 1 deletions

View File

@@ -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;