3 files changed, 11 insertions, 15 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 1a373b4d0e22..61cba39a6834 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1147,9 +1147,7 @@ void ata_dev_config(struct ata_port *ap, unsigned int i)
                 printk(KERN_INFO "ata%u(%u): applying bridge limits\n",
                        ap->id, i);
                 ap->udma_mask &= ATA_UDMA5;
-                ap->host->max_sectors = ATA_MAX_SECTORS;
-                ap->host->hostt->max_sectors = ATA_MAX_SECTORS;
-                ap->device[i].flags |= ATA_DFLAG_LOCK_SECTORS;
+                ap->device[i].max_sectors = ATA_MAX_SECTORS;
         }
 
         if (ap->ops->dev_config)
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 3628fedc9865..86da46502b3e 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -684,23 +684,23 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
         if (sdev->id < ATA_MAX_DEVICES) {
                 struct ata_port *ap;
                 struct ata_device *dev;
+                unsigned int max_sectors;
 
                 ap = (struct ata_port *) &sdev->host->hostdata[0];
                 dev = &ap->device[sdev->id];
 
-                /* TODO: 1024 is an arbitrary number, not the
+                /* TODO: 2048 is an arbitrary number, not the
                  * hardware maximum.  This should be increased to
                  * 65534 when Jens Axboe's patch for dynamically
                  * determining max_sectors is merged.
                  */
-                if ((dev->flags & ATA_DFLAG_LBA48) &&
-                    ((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) {
-                        /*
-                         * do not overwrite sdev->host->max_sectors, since
-                         * other drives on this host may not support LBA48
-                         */
-                        blk_queue_max_sectors(sdev->request_queue, 2048);
-                }
+                max_sectors = ATA_MAX_SECTORS;
+                if (dev->flags & ATA_DFLAG_LBA48)
+                        max_sectors = 2048;
+                if (dev->max_sectors)
+                        max_sectors = dev->max_sectors;
+
+                blk_queue_max_sectors(sdev->request_queue, max_sectors);
 
                 /*
                  * SATA DMA transfers must be multiples of 4 byte, so
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 61c4ac7ff9db..6c482c8be254 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -354,9 +354,7 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
              (quirks & SIL_QUIRK_MOD15WRITE))) {
                 printk(KERN_INFO "ata%u(%u): applying Seagate errata fix (mod15write workaround)\n",
                        ap->id, dev->devno);
-                ap->host->max_sectors = 15;
-                ap->host->hostt->max_sectors = 15;
-                dev->flags |= ATA_DFLAG_LOCK_SECTORS;
+                dev->max_sectors = 15;
                 return;
         }