summaryrefslogtreecommitdiff
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorJianpeng Ma <majianpeng@gmail.com>2012-08-02 09:50:39 +0200
committerJens Axboe <axboe@kernel.dk>2012-08-02 09:50:39 +0200
commit53362a05ae683e12a20d9ffdf58a88094a0bed9d (patch)
treeec4791a0b8277ebb75608e7d22f16d646c1d60e1 /fs/block_dev.c
parentc6e666345e1b79c62ba82339cc7d55a89cb73f88 (diff)
downloadlinux-3.10-53362a05ae683e12a20d9ffdf58a88094a0bed9d.tar.gz
linux-3.10-53362a05ae683e12a20d9ffdf58a88094a0bed9d.tar.bz2
linux-3.10-53362a05ae683e12a20d9ffdf58a88094a0bed9d.zip
fs/block-dev.c:fix performance regression in O_DIRECT writes to md block devices
For regular file, write operaion used blk_plug function.But for block file,write operation did not use blk_plug. This patch is also for write-cache mode for block-device. Signed-off-by: Jianpeng Ma <majianpeng@gmail.com> Reviewed-by: NeilBrown <neilb@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 1e519195d45..38e721b35d4 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1578,10 +1578,12 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
struct file *file = iocb->ki_filp;
+ struct blk_plug plug;
ssize_t ret;
BUG_ON(iocb->ki_pos != pos);
+ blk_start_plug(&plug);
ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
if (ret > 0 || ret == -EIOCBQUEUED) {
ssize_t err;
@@ -1590,6 +1592,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
if (err < 0 && ret > 0)
ret = err;
}
+ blk_finish_plug(&plug);
return ret;
}
EXPORT_SYMBOL_GPL(blkdev_aio_write);