Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

Conflicts:
	block/blk-core.c
	block/blk-flush.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	fs/nilfs2/btnode.c
	fs/nilfs2/mdt.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

4 files changed, 4 insertions, 18 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index e88a2cf17711..6f218e014e99 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -233,8 +233,7 @@ int ide_queue_sense_rq(ide_drive_t *drive, void *special)
 
         drive->hwif->rq = NULL;
 
-        elv_add_request(drive->queue, &drive->sense_rq,
-                        ELEVATOR_INSERT_FRONT, 0);
+        elv_add_request(drive->queue, &drive->sense_rq, ELEVATOR_INSERT_FRONT);
         return 0;
 }
 EXPORT_SYMBOL_GPL(ide_queue_sense_rq);
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index a2e29099ee0c..fd1e11799137 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -258,17 +258,10 @@ static int ide_cd_breathe(ide_drive_t *drive, struct request *rq)
         if (time_after(jiffies, info->write_timeout))
                 return 0;
         else {
-                struct request_queue *q = drive->queue;
-                unsigned long flags;
-
                 /*
-                 * take a breather relying on the unplug timer to kick us again
+                 * take a breather
                  */
-
-                spin_lock_irqsave(q->queue_lock, flags);
-                blk_plug_device(q);
-                spin_unlock_irqrestore(q->queue_lock, flags);
-
+                blk_delay_queue(drive->queue, 1);
                 return 1;
         }
 }
@@ -1514,8 +1507,6 @@ static int ide_cdrom_setup(ide_drive_t *drive)
         blk_queue_dma_alignment(q, 31);
         blk_queue_update_dma_pad(q, 15);
 
-        q->unplug_delay = max((1 * HZ) / 1000, 1);
-
         drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
         drive->atapi_flags = IDE_AFLAG_NO_EJECT | ide_cd_flags(id);
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 999dac054bcc..f4077840d3ab 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -549,8 +549,6 @@ plug_device_2:
 
         if (rq)
                 blk_requeue_request(q, rq);
-        if (!elv_queue_empty(q))
-                blk_plug_device(q);
 }
 
 void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
@@ -562,8 +560,6 @@ void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
 
         if (rq)
                 blk_requeue_request(q, rq);
-        if (!elv_queue_empty(q))
-                blk_plug_device(q);
 
         spin_unlock_irqrestore(q->queue_lock, flags);
 }
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index 88a380c5a470..6ab9ab2a5081 100644
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -52,7 +52,7 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
         rq->cmd[0] = REQ_UNPARK_HEADS;
         rq->cmd_len = 1;
         rq->cmd_type = REQ_TYPE_SPECIAL;
-        elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 1);
+        elv_add_request(q, rq, ELEVATOR_INSERT_FRONT);
 
 out:
         return;