Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ec0d55 authored by James Bottomley's avatar James Bottomley
Browse files

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

parents ed94724b 9c1d9c20

drivers/scsi/sd.c

+6 −3
Original line number Diff line number Diff line
@@ -2885,10 +2885,13 @@ static int sd_revalidate_disk(struct gendisk *disk) 


	/*

	 * Use the device's preferred I/O size for reads and writes

	 * unless the reported value is unreasonably large (or garbage).

	 * unless the reported value is unreasonably small, large, or

	 * garbage.

	 */

	if (sdkp->opt_xfer_blocks && sdkp->opt_xfer_blocks <= dev_max &&

	    sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS)

	if (sdkp->opt_xfer_blocks &&

	    sdkp->opt_xfer_blocks <= dev_max &&

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

	else