Commit bd67d886 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/libata-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 30c0d5b0 48c1a573
...@@ -182,7 +182,8 @@ int ata_scsi_slave_config(struct scsi_device *sdev) ...@@ -182,7 +182,8 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
* 65534 when Jens Axboe's patch for dynamically * 65534 when Jens Axboe's patch for dynamically
* determining max_sectors is merged. * determining max_sectors is merged.
*/ */
if (dev->flags & ATA_DFLAG_LBA48) { if ((dev->flags & ATA_DFLAG_LBA48) &&
((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) {
sdev->host->max_sectors = 2048; sdev->host->max_sectors = 2048;
blk_queue_max_sectors(sdev->request_queue, 2048); blk_queue_max_sectors(sdev->request_queue, 2048);
} }
......
...@@ -302,6 +302,7 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev) ...@@ -302,6 +302,7 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
ap->id, dev->devno); ap->id, dev->devno);
ap->host->max_sectors = 15; ap->host->max_sectors = 15;
ap->host->hostt->max_sectors = 15; ap->host->hostt->max_sectors = 15;
dev->flags |= ATA_DFLAG_LOCK_SECTORS;
return; return;
} }
......
...@@ -91,6 +91,7 @@ enum { ...@@ -91,6 +91,7 @@ enum {
ATA_DFLAG_MASTER = (1 << 2), /* is device 0? */ ATA_DFLAG_MASTER = (1 << 2), /* is device 0? */
ATA_DFLAG_WCACHE = (1 << 3), /* has write cache we can ATA_DFLAG_WCACHE = (1 << 3), /* has write cache we can
* (hopefully) flush? */ * (hopefully) flush? */
ATA_DFLAG_LOCK_SECTORS = (1 << 4), /* don't adjust max_sectors */
ATA_DEV_UNKNOWN = 0, /* unknown device */ ATA_DEV_UNKNOWN = 0, /* unknown device */
ATA_DEV_ATA = 1, /* ATA device */ ATA_DEV_ATA = 1, /* ATA device */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment