From: Namhyung Kim <namhyung@gmail.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org, Divyesh Shah <dpshah@google.com>
Subject: [PATCH] block: call elv_bio_merged() when merged
Date: Fri, 20 May 2011 14:28:57 +0900 [thread overview]
Message-ID: <1305869337-4375-1-git-send-email-namhyung@gmail.com> (raw)
Commit 73c101011926 ("block: initial patch for on-stack per-task plugging")
removed calls to elv_bio_merged() when @bio merged with @req. Re-add them.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Divyesh Shah <dpshah@google.com>
---
block/blk-core.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 3fe00a14822a..4dc02ef5fc82 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1132,6 +1132,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;
}
@@ -1173,6 +1174,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;
}
--
1.7.5
next reply other threads:[~2011-05-20 5:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 5:28 Namhyung Kim [this message]
2011-05-20 8:31 ` [PATCH] block: call elv_bio_merged() when merged Shaohua Li
2011-05-20 9:51 ` Namhyung Kim
2011-05-20 18:50 ` Jens Axboe
2011-05-20 19:19 ` Vivek Goyal
2011-05-20 19:21 ` Jens Axboe
2011-05-20 21:02 ` Vivek Goyal
2011-05-23 2:10 ` Shaohua Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305869337-4375-1-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=axboe@kernel.dk \
--cc=dpshah@google.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).