summaryrefslogtreecommitdiffstats
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorVivek Goyal2011-05-23 10:02:19 +0200
committerJens Axboe2011-05-23 10:02:19 +0200
commit95cf3dd9dbe6883a0328724e2110e3fc6465630b (patch)
tree738ee1f31ee14c9dbfd4336bd8c20ee42d26743d /fs/block_dev.c
parentcfq-iosched: Make IO merge related stats per cpu (diff)
downloadkernel-qcow2-linux-95cf3dd9dbe6883a0328724e2110e3fc6465630b.tar.gz
kernel-qcow2-linux-95cf3dd9dbe6883a0328724e2110e3fc6465630b.tar.xz
kernel-qcow2-linux-95cf3dd9dbe6883a0328724e2110e3fc6465630b.zip
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 'fs/block_dev.c')
0 files changed, 0 insertions, 0 deletions