aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-02-15 02:24:49 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-22 07:47:42 -0500
commit200d5a7684cc49ef4be40e832daf3f217e70dfbb (patch)
tree44f51433004ed93a750342c3216bdda1c864b1fc
parent949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff)
[PATCH] libata: increase LBA48 max sectors to 65535
max_hw_sectors/max_sectors separation patch made into the tree, increase max_sectors to its hardware limit. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/scsi/libata-scsi.c2
-rw-r--r--include/linux/libata.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index dd954a23b357..b53ef494a206 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -678,7 +678,7 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,
678 */ 678 */
679 max_sectors = ATA_MAX_SECTORS; 679 max_sectors = ATA_MAX_SECTORS;
680 if (dev->flags & ATA_DFLAG_LBA48) 680 if (dev->flags & ATA_DFLAG_LBA48)
681 max_sectors = 2048; 681 max_sectors = ATA_MAX_SECTORS_LBA48;
682 if (dev->max_sectors) 682 if (dev->max_sectors)
683 max_sectors = dev->max_sectors; 683 max_sectors = dev->max_sectors;
684 684
diff --git a/include/linux/libata.h b/include/linux/libata.h
index d81cecdda4f3..4dff3cf9d389 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -110,6 +110,7 @@ enum {
110 ATA_DEF_QUEUE = 1, 110 ATA_DEF_QUEUE = 1,
111 ATA_MAX_QUEUE = 1, 111 ATA_MAX_QUEUE = 1,
112 ATA_MAX_SECTORS = 200, /* FIXME */ 112 ATA_MAX_SECTORS = 200, /* FIXME */
113 ATA_MAX_SECTORS_LBA48 = 65535,
113 ATA_MAX_BUS = 2, 114 ATA_MAX_BUS = 2,
114 ATA_DEF_BUSY_WAIT = 10000, 115 ATA_DEF_BUSY_WAIT = 10000,
115 ATA_SHORT_PAUSE = (HZ >> 6) + 1, 116 ATA_SHORT_PAUSE = (HZ >> 6) + 1,