From 8b9c0f7c539c5f4cdb8665d60b3690599f1b4fb5 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sun, 1 May 2005 08:59:06 -0700 Subject: [PATCH] --- yaml --- r: 723 b: refs/heads/master c: 1181c1f923c349acaa01bca40fe600584f265132 h: refs/heads/master i: 721: 6a799cf8a1903dcaaf29f52d56344ec32ff5747e 719: 6f5867a89de55d0e71aaa5dd12bd39171b9054e5 v: v3 --- [refs] | 2 +- trunk/drivers/block/noop-iosched.c | 27 +++------------------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 0cd2f566c4aa..4af7e741f561 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41f11a4fa378201e902892130b11d78cf7cf8e10 +refs/heads/master: 1181c1f923c349acaa01bca40fe600584f265132 diff --git a/trunk/drivers/block/noop-iosched.c b/trunk/drivers/block/noop-iosched.c index 888c477e02b3..b1730b62c37e 100644 --- a/trunk/drivers/block/noop-iosched.c +++ b/trunk/drivers/block/noop-iosched.c @@ -13,34 +13,13 @@ static int elevator_noop_merge(request_queue_t *q, struct request **req, struct bio *bio) { - struct list_head *entry = &q->queue_head; - struct request *__rq; int ret; - if ((ret = elv_try_last_merge(q, bio))) { + ret = elv_try_last_merge(q, bio); + if (ret != ELEVATOR_NO_MERGE) *req = q->last_merge; - return ret; - } - while ((entry = entry->prev) != &q->queue_head) { - __rq = list_entry_rq(entry); - - if (__rq->flags & (REQ_SOFTBARRIER | REQ_HARDBARRIER)) - break; - else if (__rq->flags & REQ_STARTED) - break; - - if (!blk_fs_request(__rq)) - continue; - - if ((ret = elv_try_merge(__rq, bio))) { - *req = __rq; - q->last_merge = __rq; - return ret; - } - } - - return ELEVATOR_NO_MERGE; + return ret; } static void elevator_noop_merge_requests(request_queue_t *q, struct request *req,