[PATCH] ide: missing rq checks in ide-disk

ide-disk only checks for drive->blocked and blk_fs_request() if TASKFILE_IO
is defined.  Move these checks (and TCQ check too) to upper function.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 6db5e9d349eed74402a4083c9aa0e97cae8921d7..b660903131ed97620e7e535eada6ebbb28891c90 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -358,13 +358,6 @@ ide_startstop_t __ide_do_rw_disk (ide_drive_t *drive, struct request *rq, sector
 
        nsectors.all            = (u16) rq->nr_sectors;
 
-       if (drive->using_tcq && idedisk_start_tag(drive, rq)) {
-               if (!ata_pending_commands(drive))
-                       BUG();
-
-               return ide_started;
-       }
-
        if (IDE_CONTROL_REG)
                hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
 
@@ -482,7 +475,7 @@ ide_startstop_t __ide_do_rw_disk (ide_drive_t *drive, struct request *rq, sector
                           ((lba48) ? WIN_READ_EXT : WIN_READ));
                ide_execute_command(drive, command, &read_intr, WAIT_CMD, NULL);
                return ide_started;
-       } else if (rq_data_dir(rq) == WRITE) {
+       } else {
                ide_startstop_t startstop;
 #ifdef CONFIG_BLK_DEV_IDE_TCQ
                if (blk_rq_tagged(rq))
@@ -520,9 +513,6 @@ ide_startstop_t __ide_do_rw_disk (ide_drive_t *drive, struct request *rq, sector
                }
                return ide_started;
        }
-       blk_dump_rq_flags(rq, "__ide_do_rw_disk - bad command");
-       ide_end_request(drive, 0, 0);
-       return ide_stopped;
 }
 EXPORT_SYMBOL_GPL(__ide_do_rw_disk);
 
@@ -539,26 +529,11 @@ static ide_startstop_t lba_48_rw_disk(ide_drive_t *, struct request *, unsigned
  */
 ide_startstop_t __ide_do_rw_disk (ide_drive_t *drive, struct request *rq, sector_t block)
 {
-       BUG_ON(drive->blocked);
-       if (!blk_fs_request(rq)) {
-               blk_dump_rq_flags(rq, "__ide_do_rw_disk - bad command");
-               ide_end_request(drive, 0, 0);
-               return ide_stopped;
-       }
-
        /*
         * 268435455  == 137439 MB or 28bit limit
         *
         * need to add split taskfile operations based on 28bit threshold.
         */
-
-       if (drive->using_tcq && idedisk_start_tag(drive, rq)) {
-               if (!ata_pending_commands(drive))
-                       BUG();
-
-               return ide_started;
-       }
-
        if (drive->addressing == 1)             /* 48-bit LBA */
                return lba_48_rw_disk(drive, rq, (unsigned long long) block);
        if (drive->select.b.lba)                /* 28-bit LBA */
@@ -734,6 +709,21 @@ static ide_startstop_t ide_do_rw_disk (ide_drive_t *drive, struct request *rq, s
 {
        ide_hwif_t *hwif = HWIF(drive);
 
+       BUG_ON(drive->blocked);
+
+       if (!blk_fs_request(rq)) {
+               blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
+               ide_end_request(drive, 0, 0);
+               return ide_stopped;
+       }
+
+       if (drive->using_tcq && idedisk_start_tag(drive, rq)) {
+               if (!ata_pending_commands(drive))
+                       BUG();
+
+               return ide_started;
+       }
+
        if (hwif->rw_disk)
                return hwif->rw_disk(drive, rq, block);
        else

diff --git a/drivers/ide/legacy/pdc4030.c b/drivers/ide/legacy/pdc4030.c
index 802e1f64a93075ca3fba35e592762e7fae7d544e..10ab931a71afc9a0f0801892474373d7854330a9 100644 (file)
--- a/drivers/ide/legacy/pdc4030.c
+++ b/drivers/ide/legacy/pdc4030.c
@@ -756,12 +756,6 @@ static ide_startstop_t promise_rw_disk (ide_drive_t *drive, struct request *rq,
 
        BUG_ON(rq->nr_sectors > 127);
 
-       if (!blk_fs_request(rq)) {
-               blk_dump_rq_flags(rq, "promise_rw_disk - bad command");
-               DRIVER(drive)->end_request(drive, 0, 0);
-               return ide_stopped;
-       }
-
 #ifdef DEBUG
        printk(KERN_DEBUG "%s: %sing: LBAsect=%lu, sectors=%lu\n",
                          drive->name, rq_data_dir(rq) ? "writ" : "read",