Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'max-sect' into upstream

Jeff Garzik 19 years ago
parent
efa6e7e9d4 9a375e93f8
commit
8d4ee71ff6
2 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      drivers/scsi/libata-scsi.c
  2. 1 0
      include/linux/libata.h

+ 1 - 1
drivers/scsi/libata-scsi.c
View File 

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

+ 1 - 0
include/linux/libata.h
View File 

@@ -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,