Commit 95cf3dd9 authored May 23, 2011 by Vivek Goyal Committed by Jens Axboe May 23, 2011

block: call elv_bio_merged() when merged



Commit 73c10101 ("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>

parent 317389a7

block/blk-core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}