diff options
| author | Josef Bacik <josef@redhat.com> | 2010-05-23 11:07:21 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-05-25 10:34:57 -0400 |
| commit | 11c65dccf70be9ace5dbd3906778e1a099b1fee1 (patch) | |
| tree | 1289f139ddf652e39672374b6f9051994c21ce57 /fs/btrfs/extent_io.c | |
| parent | 4b46fce23349bfca781a32e2707a18328ca5ae22 (diff) | |
| download | kernel_samsung_smdk4412-11c65dccf70be9ace5dbd3906778e1a099b1fee1.zip kernel_samsung_smdk4412-11c65dccf70be9ace5dbd3906778e1a099b1fee1.tar.gz kernel_samsung_smdk4412-11c65dccf70be9ace5dbd3906778e1a099b1fee1.tar.bz2 | |
Btrfs: do aio_write instead of write
In order for AIO to work, we need to implement aio_write. This patch converts
our btrfs_file_write to btrfs_aio_write. I've tested this with xfstests and
nothing broke, and the AIO stuff magically started working. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 1a57c17..a53aca3 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2017,6 +2017,7 @@ static int __extent_read_full_page(struct extent_io_tree *tree, sector_t sector; struct extent_map *em; struct block_device *bdev; + struct btrfs_ordered_extent *ordered; int ret; int nr = 0; size_t page_offset = 0; @@ -2028,7 +2029,15 @@ static int __extent_read_full_page(struct extent_io_tree *tree, set_page_extent_mapped(page); end = page_end; - lock_extent(tree, start, end, GFP_NOFS); + while (1) { + lock_extent(tree, start, end, GFP_NOFS); + ordered = btrfs_lookup_ordered_extent(inode, start); + if (!ordered) + break; + unlock_extent(tree, start, end, GFP_NOFS); + btrfs_start_ordered_extent(inode, ordered, 1); + btrfs_put_ordered_extent(ordered); + } if (page->index == last_byte >> PAGE_CACHE_SHIFT) { char *userpage; |