diff options
| author | Fengguang Wu <fengguang.wu@intel.com> | 2012-08-09 15:23:07 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-08-09 15:23:07 +0200 |
| commit | 8430f9772f9ac305211f177b0fa56a312175da11 (patch) | |
| tree | 02756ec7fd9c3f5545858dd7aa8c6da4b3e77866 /mm | |
| parent | block: disable discard request merge temporarily (diff) | |
| download | linux-8430f9772f9ac305211f177b0fa56a312175da11.tar.xz linux-8430f9772f9ac305211f177b0fa56a312175da11.zip | |
block: remove plugging at buffered write time
Buffered write(2) is not directly tied to IO, so it's not suitable to
handle plug in generic_file_aio_write().
Note that plugging for O_SYNC writes is also removed. The user may pass
arbitrary @size arguments, which may be much larger than the preferable
I/O size, or may cross extent/device boundaries. Let the lower layers
handle the plugging. The plugging code here actually turns them into
no-ops.
CC: Li Shaohua <shli@fusionio.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index fa5ca304148e..2b0952974cb9 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2527,14 +2527,12 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, { struct file *file = iocb->ki_filp; struct inode *inode = file->f_mapping->host; - struct blk_plug plug; ssize_t ret; BUG_ON(iocb->ki_pos != pos); sb_start_write(inode->i_sb); mutex_lock(&inode->i_mutex); - blk_start_plug(&plug); ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); mutex_unlock(&inode->i_mutex); @@ -2545,7 +2543,6 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, if (err < 0 && ret > 0) ret = err; } - blk_finish_plug(&plug); sb_end_write(inode->i_sb); return ret; } |