2 files changed, 5 insertions, 1 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index c4198f083e5b..25572802dac2 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1128,6 +1128,8 @@ void init_request_from_bio(struct request *req, struct bio *bio)
                 req->cmd_flags |= REQ_UNPLUG;
         if (bio_rw_meta(bio))
                 req->cmd_flags |= REQ_RW_META;
+        if (bio_noidle(bio))
+                req->cmd_flags |= REQ_NOIDLE;
 
         req->errors = 0;
         req->hard_sector = req->sector = bio->bi_sector;
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 664ebfd092ec..9e809345f71a 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1992,8 +1992,10 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
                 }
                 if (cfq_slice_used(cfqq) || cfq_class_idle(cfqq))
                         cfq_slice_expired(cfqd, 1);
-                else if (sync && RB_EMPTY_ROOT(&cfqq->sort_list))
+                else if (sync && !rq_noidle(rq) &&
+                         RB_EMPTY_ROOT(&cfqq->sort_list)) {
                         cfq_arm_slice_timer(cfqd);
+                }
         }
 
         if (!cfqd->rq_in_driver)