From: Vivek Goyal <vgoyal@redhat.com>
Date: Mon, 23 May 2011 08:02:19 +0000 (+0200)
Subject: block: call elv_bio_merged() when merged
X-Git-Tag: v3.0-rc1~163^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95cf3dd9dbe6883a0328724e2110e3fc6465630b;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed