aboutsummaryrefslogtreecommitdiff
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-08-09 15:23:09 +0200
committerJens Axboe <axboe@kernel.dk>2012-08-09 15:23:09 +0200
commit647d1e4c5235763b83fbfe74a09d148edc6ca152 (patch)
tree5c7be727323b16ee80ddba672b3b3baa69454486 /mm/filemap.c
parent8430f9772f9ac305211f177b0fa56a312175da11 (diff)
downloadlinaro-lsk-647d1e4c5235763b83fbfe74a09d148edc6ca152.tar.gz
block: move down direct IO plugging
Move unplugging for direct I/O from around ->direct_IO() down to do_blockdev_direct_IO(). This implicitly adds plugging for direct writes. CC: Li Shaohua <shli@fusionio.com> Acked-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'mm/filemap.c')
-rw-r--r--mm/filemap.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 2b0952974cb..384344575c3 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1412,12 +1412,8 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
retval = filemap_write_and_wait_range(mapping, pos,
pos + iov_length(iov, nr_segs) - 1);
if (!retval) {
- struct blk_plug plug;
-
- blk_start_plug(&plug);
retval = mapping->a_ops->direct_IO(READ, iocb,
iov, pos, nr_segs);
- blk_finish_plug(&plug);
}
if (retval > 0) {
*ppos = pos + retval;