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

Commit 27ea13e6 authored by James Bottomley's avatar James Bottomley
Browse files

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

parents b02b1fbd 6b7e9cde

drivers/scsi/scsi_devinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static struct { 
	{"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},

	{"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},

	{"Promise", "", NULL, BLIST_SPARSELUN},

	{"QEMU", "QEMU CD-ROM", NULL, BLIST_SKIP_VPD_PAGES},

	{"QNAP", "iSCSI Storage", NULL, BLIST_MAX_1024},

	{"SYNOLOGY", "iSCSI Storage", NULL, BLIST_MAX_1024},

	{"QUANTUM", "XP34301", "1071", BLIST_NOTQ},

drivers/scsi/sd.c

+4 −4
Original line number Diff line number Diff line
@@ -2867,10 +2867,10 @@ static int sd_revalidate_disk(struct gendisk *disk) 
	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_SIZE)

		rw_max = q->limits.io_opt =

			sdkp->opt_xfer_blocks * sdp->sector_size;

	else

	    logical_to_bytes(sdp, sdkp->opt_xfer_blocks) >= PAGE_SIZE) {

		q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks);

		rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks);

	} else

		rw_max = BLK_DEF_MAX_SECTORS;



	/* Combine with controller limits */

drivers/scsi/sd.h

+5 −0
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ static inline sector_t logical_to_sectors(struct scsi_device *sdev, sector_t blo 
	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

 * protection schemes.  Currently 0 through 3 are defined: