block: call elv_bio_merged() when merged
authorVivek Goyal <vgoyal@redhat.com>
Mon, 23 May 2011 08:02:19 +0000 (10:02 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Mon, 23 May 2011 08:02:19 +0000 (10:02 +0200)
commit95cf3dd9dbe6883a0328724e2110e3fc6465630b
tree738ee1f31ee14c9dbfd4336bd8c20ee42d26743d
parent317389a7739675aa990b7e0d750a7c435f1d25d7
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>
block/blk-core.c