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

Commit 8d4ee71f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'max-sect' into upstream

parents efa6e7e9 9a375e93

drivers/scsi/libata-scsi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -670,7 +670,7 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, 
	 */

	 */

	max_sectors = ATA_MAX_SECTORS;

	max_sectors = ATA_MAX_SECTORS;

	if (dev->flags & ATA_DFLAG_LBA48)

	if (dev->flags & ATA_DFLAG_LBA48)

		max_sectors = 2048;

		max_sectors = ATA_MAX_SECTORS_LBA48;

	if (dev->max_sectors)

	if (dev->max_sectors)

		max_sectors = dev->max_sectors;

		max_sectors = dev->max_sectors;

include/linux/libata.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ enum { 
	ATA_MAX_QUEUE		= 32,

	ATA_MAX_QUEUE		= 32,

	ATA_TAG_INTERNAL	= ATA_MAX_QUEUE - 1,

	ATA_TAG_INTERNAL	= ATA_MAX_QUEUE - 1,

	ATA_MAX_SECTORS		= 200,	/* FIXME */

	ATA_MAX_SECTORS		= 200,	/* FIXME */

	ATA_MAX_SECTORS_LBA48	= 65535,

	ATA_MAX_BUS		= 2,

	ATA_MAX_BUS		= 2,

	ATA_DEF_BUSY_WAIT	= 10000,

	ATA_DEF_BUSY_WAIT	= 10000,

	ATA_SHORT_PAUSE		= (HZ >> 6) + 1,

	ATA_SHORT_PAUSE		= (HZ >> 6) + 1,