From 318f013d5f97b60a82ddf55253867b7296148ce7 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Mon, 23 May 2011 10:02:19 +0200 Subject: [PATCH] --- yaml --- r: 251168 b: refs/heads/master c: 95cf3dd9dbe6883a0328724e2110e3fc6465630b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 28e5b80d94c9..6574a2fd504a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 317389a7739675aa990b7e0d750a7c435f1d25d7 +refs/heads/master: 95cf3dd9dbe6883a0328724e2110e3fc6465630b diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 7369eeeafe23..c8303e9d919d 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -1122,6 +1122,7 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req, req->ioprio = ioprio_best(req->ioprio, bio_prio(bio)); drive_stat_acct(req, 0); + elv_bio_merged(q, req, bio); return true; } @@ -1155,6 +1156,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, req->ioprio = ioprio_best(req->ioprio, bio_prio(bio)); drive_stat_acct(req, 0); + elv_bio_merged(q, req, bio); return true; }