diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2011-05-23 10:02:19 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-05-23 10:02:19 +0200 |
| commit | 95cf3dd9dbe6883a0328724e2110e3fc6465630b (patch) | |
| tree | 738ee1f31ee14c9dbfd4336bd8c20ee42d26743d /block | |
| parent | 317389a7739675aa990b7e0d750a7c435f1d25d7 (diff) | |
| download | op-kernel-dev-95cf3dd9dbe6883a0328724e2110e3fc6465630b.zip op-kernel-dev-95cf3dd9dbe6883a0328724e2110e3fc6465630b.tar.gz | |
block: call elv_bio_merged() when merged
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.
This in turn will update merged stats in associated group. That
should be safe as long as request has got reference to the blkio_group.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Divyesh Shah <dpshah@google.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
| -rw-r--r-- | 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 7369eee..c8303e9 100644 --- a/block/blk-core.c +++ b/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; } |
