2 files changed, 38 insertions, 37 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index e47a9309eb48..0b4a47905575 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -789,6 +789,20 @@ static inline void cfq_slice_expired(struct cfq_data *cfqd, int timed_out)
                 __cfq_slice_expired(cfqd, cfqq, timed_out);
 }
 
+static int start_idle_class_timer(struct cfq_data *cfqd)
+{
+        unsigned long end = cfqd->last_end_request + CFQ_IDLE_GRACE;
+        unsigned long now = jiffies;
+
+        if (time_before(now, end) &&
+            time_after_eq(now, cfqd->last_end_request)) {
+                mod_timer(&cfqd->idle_class_timer, end);
+                return 1;
+        }
+
+        return 0;
+}
+
 /*
  * Get next queue for service. Unless we have a queue preemption,
  * we'll simply select the first cfqq in the service tree.
@@ -805,19 +819,14 @@ static struct cfq_queue *cfq_get_next_queue(struct cfq_data *cfqd)
         cfqq = rb_entry(n, struct cfq_queue, rb_node);
 
         if (cfq_class_idle(cfqq)) {
-                unsigned long end;
-
                 /*
                  * if we have idle queues and no rt or be queues had
                  * pending requests, either allow immediate service if
                  * the grace period has passed or arm the idle grace
                  * timer
                  */
-                end = cfqd->last_end_request + CFQ_IDLE_GRACE;
-                if (time_before(jiffies, end)) {
-                        mod_timer(&cfqd->idle_class_timer, end);
+                if (start_idle_class_timer(cfqd))
                         cfqq = NULL;
-                }
         }
 
         return cfqq;
@@ -2036,17 +2045,14 @@ out_cont:
 static void cfq_idle_class_timer(unsigned long data)
 {
         struct cfq_data *cfqd = (struct cfq_data *) data;
-        unsigned long flags, end;
+        unsigned long flags;
 
         spin_lock_irqsave(cfqd->queue->queue_lock, flags);
 
         /*
          * race with a non-idle queue, reset timer
          */
-        end = cfqd->last_end_request + CFQ_IDLE_GRACE;
-        if (!time_after_eq(jiffies, end))
-                mod_timer(&cfqd->idle_class_timer, end);
-        else
+        if (!start_idle_class_timer(cfqd))
                 cfq_schedule_dispatch(cfqd);
 
         spin_unlock_irqrestore(cfqd->queue->queue_lock, flags);
@@ -2068,9 +2074,10 @@ static void cfq_put_async_queues(struct cfq_data *cfqd)
                         cfq_put_queue(cfqd->async_cfqq[0][i]);
                 if (cfqd->async_cfqq[1][i])
                         cfq_put_queue(cfqd->async_cfqq[1][i]);
-                if (cfqd->async_idle_cfqq)
-                        cfq_put_queue(cfqd->async_idle_cfqq);
         }
+
+        if (cfqd->async_idle_cfqq)
+                cfq_put_queue(cfqd->async_idle_cfqq);
 }
 
 static void cfq_exit_queue(elevator_t *e)
@@ -2125,6 +2132,7 @@ static void *cfq_init_queue(struct request_queue *q)
 
         INIT_WORK(&cfqd->unplug_work, cfq_kick_queue);
 
+        cfqd->last_end_request = jiffies;
         cfqd->cfq_quantum = cfq_quantum;
         cfqd->cfq_fifo_expire[0] = cfq_fifo_expire[0];
         cfqd->cfq_fifo_expire[1] = cfq_fifo_expire[1];
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 75c98d58f4dd..3b927be03850 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1143,22 +1143,9 @@ EXPORT_SYMBOL(blk_queue_start_tag);
 void blk_queue_invalidate_tags(struct request_queue *q)
 {
         struct list_head *tmp, *n;
-        struct request *rq;
-
-        list_for_each_safe(tmp, n, &q->tag_busy_list) {
-                rq = list_entry_rq(tmp);
 
-                if (rq->tag == -1) {
-                        printk(KERN_ERR
-                               "%s: bad tag found on list\n", __FUNCTION__);
-                        list_del_init(&rq->queuelist);
-                        rq->cmd_flags &= ~REQ_QUEUED;
-                } else
-                        blk_queue_end_tag(q, rq);
-
-                rq->cmd_flags &= ~REQ_STARTED;
-                __elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 0);
-        }
+        list_for_each_safe(tmp, n, &q->tag_busy_list)
+                blk_requeue_request(q, list_entry_rq(tmp));
 }
 
 EXPORT_SYMBOL(blk_queue_invalidate_tags);
@@ -1634,15 +1621,7 @@ static void blk_backing_dev_unplug(struct backing_dev_info *bdi,
 {
         struct request_queue *q = bdi->unplug_io_data;
 
-        /*
-         * devices don't necessarily have an ->unplug_fn defined
-         */
-        if (q->unplug_fn) {
-                blk_add_trace_pdu_int(q, BLK_TA_UNPLUG_IO, NULL,
-                                        q->rq.count[READ] + q->rq.count[WRITE]);
-
-                q->unplug_fn(q);
-        }
+        blk_unplug(q);
 }
 
 static void blk_unplug_work(struct work_struct *work)
@@ -1666,6 +1645,20 @@ static void blk_unplug_timeout(unsigned long data)
         kblockd_schedule_work(&q->unplug_work);
 }
 
+void blk_unplug(struct request_queue *q)
+{
+        /*
+         * devices don't necessarily have an ->unplug_fn defined
+         */
+        if (q->unplug_fn) {
+                blk_add_trace_pdu_int(q, BLK_TA_UNPLUG_IO, NULL,
+                                        q->rq.count[READ] + q->rq.count[WRITE]);
+
+                q->unplug_fn(q);
+        }
+}
+EXPORT_SYMBOL(blk_unplug);
+
 /**
  * blk_start_queue - restart a previously stopped queue
  * @q:    The &struct request_queue in question