patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / ide / ide-io.c

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8ae4974..ff5b16a 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -97,10 +97,7 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
 
        if (!end_that_request_first(rq, uptodate, nr_sectors)) {
                add_disk_randomness(rq->rq_disk);
-               if (!blk_rq_tagged(rq))
-                       blkdev_dequeue_request(rq);
-               else
-                       blk_queue_end_tag(drive->queue, rq);
+               blkdev_dequeue_request(rq);
                HWGROUP(drive)->rq = NULL;
                end_that_request_last(rq);
                ret = 0;
@@ -855,18 +852,7 @@ void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
                drive->sleep = 0;
                drive->service_start = jiffies;
 
-queue_next:
-               if (!ata_can_queue(drive)) {
-                       if (!ata_pending_commands(drive))
-                               hwgroup->busy = 0;
-
-                       break;
-               }
-
                if (blk_queue_plugged(drive->queue)) {
-                       if (drive->using_tcq)
-                               break;
-
                        printk(KERN_ERR "ide: huh? queue was plugged!\n");
                        break;
                }
@@ -877,7 +863,7 @@ queue_next:
                 */
                rq = elv_next_request(drive->queue);
                if (!rq) {
-                       hwgroup->busy = !!ata_pending_commands(drive);
+                       hwgroup->busy = 0;
                        break;
                }
 
@@ -900,9 +886,6 @@ queue_next:
                        break;
                }
 
-               if (!rq->bio && ata_pending_commands(drive))
-                       break;
-
                hwgroup->rq = rq;
 
                /*
@@ -922,8 +905,6 @@ queue_next:
                spin_lock_irq(&ide_lock);
                if (hwif->irq != masked_irq)
                        enable_irq(hwif->irq);
-               if (startstop == ide_released)
-                       goto queue_next;
                if (startstop == ide_stopped)
                        hwgroup->busy = 0;
        }
@@ -1388,6 +1369,7 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
        err = 0;
        if (must_wait) {
                wait_for_completion(&wait);
+               rq->waiting = NULL;
                if (rq->errors)
                        err = -EIO;