diff options
author | Fengguang Wu <fengguang.wu@intel.com> | 2012-08-09 09:23:07 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-08-09 09:23:07 -0400 |
commit | 8430f9772f9ac305211f177b0fa56a312175da11 (patch) | |
tree | 02756ec7fd9c3f5545858dd7aa8c6da4b3e77866 /mm | |
parent | 276f0f5d157bb4a816053f4f3a941dbcd4f76556 (diff) |
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, | |||
2527 | { | 2527 | { |
2528 | struct file *file = iocb->ki_filp; | 2528 | struct file *file = iocb->ki_filp; |
2529 | struct inode *inode = file->f_mapping->host; | 2529 | struct inode *inode = file->f_mapping->host; |
2530 | struct blk_plug plug; | ||
2531 | ssize_t ret; | 2530 | ssize_t ret; |
2532 | 2531 | ||
2533 | BUG_ON(iocb->ki_pos != pos); | 2532 | BUG_ON(iocb->ki_pos != pos); |
2534 | 2533 | ||
2535 | sb_start_write(inode->i_sb); | 2534 | sb_start_write(inode->i_sb); |
2536 | mutex_lock(&inode->i_mutex); | 2535 | mutex_lock(&inode->i_mutex); |
2537 | blk_start_plug(&plug); | ||
2538 | ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); | 2536 | ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); |
2539 | mutex_unlock(&inode->i_mutex); | 2537 | mutex_unlock(&inode->i_mutex); |
2540 | 2538 | ||
@@ -2545,7 +2543,6 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
2545 | if (err < 0 && ret > 0) | 2543 | if (err < 0 && ret > 0) |
2546 | ret = err; | 2544 | ret = err; |
2547 | } | 2545 | } |
2548 | blk_finish_plug(&plug); | ||
2549 | sb_end_write(inode->i_sb); | 2546 | sb_end_write(inode->i_sb); |
2550 | return ret; | 2547 | return ret; |
2551 | } | 2548 | } |