2 files changed, 6 insertions, 20 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 7433e07de30e..7c5b01ce51d2 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -516,10 +516,10 @@ static int ide_do_setfeature(ide_drive_t *drive, u8 feature, u8 nsect)
         return ide_no_data_taskfile(drive, &cmd);
 }
 
-static void update_ordered(ide_drive_t *drive)
+static void update_flush(ide_drive_t *drive)
 {
         u16 *id = drive->id;
-        unsigned ordered = QUEUE_ORDERED_NONE;
+        unsigned flush = 0;
 
         if (drive->dev_flags & IDE_DFLAG_WCACHE) {
                 unsigned long long capacity;
@@ -543,13 +543,12 @@ static void update_ordered(ide_drive_t *drive)
                        drive->name, barrier ? "" : "not ");
 
                 if (barrier) {
-                        ordered = QUEUE_ORDERED_DRAIN_FLUSH;
+                        flush = REQ_FLUSH;
                         blk_queue_prep_rq(drive->queue, idedisk_prep_fn);
                 }
-        } else
-                ordered = QUEUE_ORDERED_DRAIN;
+        }
 
-        blk_queue_ordered(drive->queue, ordered);
+        blk_queue_flush(drive->queue, flush);
 }
 
 ide_devset_get_flag(wcache, IDE_DFLAG_WCACHE);
@@ -572,7 +571,7 @@ static int set_wcache(ide_drive_t *drive, int arg)
                 }
         }
 
-        update_ordered(drive);
+        update_flush(drive);
 
         return err;
 }
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index a381be814070..999dac054bcc 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -441,19 +441,6 @@ void do_ide_request(struct request_queue *q)
         struct request  *rq = NULL;
         ide_startstop_t startstop;
 
-        /*
-         * drive is doing pre-flush, ordered write, post-flush sequence. even
-         * though that is 3 requests, it must be seen as a single transaction.
-         * we must not preempt this drive until that is complete
-         */
-        if (blk_queue_flushing(q))
-                /*
-                 * small race where queue could get replugged during
-                 * the 3-request flush cycle, just yank the plug since
-                 * we want it to finish asap
-                 */
-                blk_remove_plug(q);
-
         spin_unlock_irq(q->queue_lock);
 
         /* HLD do_request() callback might sleep, make sure it's okay */