diff options
author | Tejun Heo <htejun@gmail.com> | 2006-11-14 08:47:10 -0500 |
---|---|---|
committer | Tejun Heo <htejun@gmail.com> | 2006-12-03 03:56:24 -0500 |
commit | 70e6ad0c6d1e6cb9ee3c036a85ca2561eb1fd766 (patch) | |
tree | 9af1423c89d7f58093d2ee3cfc2112c2060ebfca /drivers/ata/libata-core.c | |
parent | bd056d7eeb55d696556ee4f5ee2acb67b2d16df4 (diff) |
[PATCH] libata: prepare ata_sg_clean() for invocation from EH
Make ata_sg_clean() global and don't allow NCQ for internal commands.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4ac53ef0e4b0..883276388207 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -309,7 +309,8 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, | |||
309 | tf->flags |= tf_flags; | 309 | tf->flags |= tf_flags; |
310 | 310 | ||
311 | if ((dev->flags & (ATA_DFLAG_PIO | ATA_DFLAG_NCQ_OFF | | 311 | if ((dev->flags & (ATA_DFLAG_PIO | ATA_DFLAG_NCQ_OFF | |
312 | ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ) { | 312 | ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ && |
313 | likely(tag != ATA_TAG_INTERNAL)) { | ||
313 | /* yay, NCQ */ | 314 | /* yay, NCQ */ |
314 | if (!lba_48_ok(block, n_block)) | 315 | if (!lba_48_ok(block, n_block)) |
315 | return -ERANGE; | 316 | return -ERANGE; |
@@ -3533,8 +3534,7 @@ static unsigned int ata_dev_init_params(struct ata_device *dev, | |||
3533 | * LOCKING: | 3534 | * LOCKING: |
3534 | * spin_lock_irqsave(host lock) | 3535 | * spin_lock_irqsave(host lock) |
3535 | */ | 3536 | */ |
3536 | 3537 | void ata_sg_clean(struct ata_queued_cmd *qc) | |
3537 | static void ata_sg_clean(struct ata_queued_cmd *qc) | ||
3538 | { | 3538 | { |
3539 | struct ata_port *ap = qc->ap; | 3539 | struct ata_port *ap = qc->ap; |
3540 | struct scatterlist *sg = qc->__sg; | 3540 | struct scatterlist *sg = qc->__sg; |