From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fengguang Wu Subject: [PATCH] block: move down direct IO plugging Date: Sun, 6 May 2012 14:04:06 +0800 Message-ID: <20120506060406.GB11650@localhost> References: <20120506060308.GA11650@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jens Axboe , linux-fsdevel@vger.kernel.org, LKML , Dave Chinner , Christoph Hellwig , Jan Kara , Chris Mason , Shaohua Li , Jeff Moyer To: Andrew Morton Return-path: Content-Disposition: inline In-Reply-To: <20120506060308.GA11650@localhost> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Move unplugging for direct I/O from around ->direct_IO() down to do_blockdev_direct_IO(). This implicitly adds plugging for direct writes. CC: Jens Axboe CC: Li Shaohua Acked-by: Jeff Moyer Signed-off-by: Wu Fengguang --- fs/direct-io.c | 5 +++++ mm/filemap.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) --- linux-next.orig/mm/filemap.c 2012-05-03 19:32:58.051123379 +0800 +++ linux-next/mm/filemap.c 2012-05-03 19:33:27.235124073 +0800 @@ -1413,12 +1413,8 @@ generic_file_aio_read(struct kiocb *iocb 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; --- linux-next.orig/fs/direct-io.c 2012-05-03 19:32:57.000000000 +0800 +++ linux-next/fs/direct-io.c 2012-05-03 19:33:27.235124073 +0800 @@ -1106,6 +1106,7 @@ do_blockdev_direct_IO(int rw, struct kio unsigned long user_addr; size_t bytes; struct buffer_head map_bh = { 0, }; + struct blk_plug plug; if (rw & WRITE) rw = WRITE_ODIRECT; @@ -1221,6 +1222,8 @@ do_blockdev_direct_IO(int rw, struct kio PAGE_SIZE - user_addr / PAGE_SIZE); } + blk_start_plug(&plug); + for (seg = 0; seg < nr_segs; seg++) { user_addr = (unsigned long)iov[seg].iov_base; sdio.size += bytes = iov[seg].iov_len; @@ -1279,6 +1282,8 @@ do_blockdev_direct_IO(int rw, struct kio if (sdio.bio) dio_bio_submit(dio, &sdio); + blk_finish_plug(&plug); + /* * It is possible that, we return short IO due to end of file. * In that case, we need to release all the pages we got hold on.