evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "sd: Fix rw_max for devices that report an optimal xfer size""

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-06 14:33:10 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5a0cfd1234
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/scsi/sd.c
View file

@ -2806,10 +2806,10 @@ static int sd_revalidate_disk(struct gendisk *disk)
if (sdkp->opt_xfer_blocks && if (sdkp->opt_xfer_blocks &&
sdkp->opt_xfer_blocks <= dev_max && sdkp->opt_xfer_blocks <= dev_max &&
sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS && sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
logical_to_bytes(sdp, sdkp->opt_xfer_blocks) >= PAGE_CACHE_SIZE) { sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks); rw_max = q->limits.io_opt =
rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks); sdkp->opt_xfer_blocks * sdp->sector_size;
} else else
rw_max = BLK_DEF_MAX_SECTORS; rw_max = BLK_DEF_MAX_SECTORS;
/* Combine with controller limits */ /* Combine with controller limits */

5
drivers/scsi/sd.h
View file

@ -151,11 +151,6 @@ static inline sector_t logical_to_sectors(struct scsi_device *sdev, sector_t blo
return blocks << (ilog2(sdev->sector_size) - 9); return blocks << (ilog2(sdev->sector_size) - 9);
} }
static inline unsigned int logical_to_bytes(struct scsi_device *sdev, sector_t blocks)
{
return blocks * sdev->sector_size;
}
/* /*
* A DIF-capable target device can be formatted with different * A DIF-capable target device can be formatted with different
* protection schemes. Currently 0 through 3 are defined: * protection schemes. Currently 0 through 3 are defined: