Merge branch 'max-sect' into upstream

git-mirror · May 15, 2006 · 8d4ee71 · 8d4ee71
2 parents efa6e7e + 9a375e9
commit 8d4ee71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
@@ -670,7 +670,7 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,
 	 */
 	max_sectors = ATA_MAX_SECTORS;
 	if (dev->flags & ATA_DFLAG_LBA48)
-		max_sectors = 2048;
+		max_sectors = ATA_MAX_SECTORS_LBA48;
 	if (dev->max_sectors)
 		max_sectors = dev->max_sectors;
 

diff --git a/include/linux/libata.h b/include/linux/libata.h
@@ -112,6 +112,7 @@ enum {
 	ATA_MAX_QUEUE		= 32,
 	ATA_TAG_INTERNAL	= ATA_MAX_QUEUE - 1,
 	ATA_MAX_SECTORS		= 200,	/* FIXME */
+	ATA_MAX_SECTORS_LBA48	= 65535,
 	ATA_MAX_BUS		= 2,
 	ATA_DEF_BUSY_WAIT	= 10000,
 	ATA_SHORT_PAUSE		= (HZ >> 6) + 1,