diff options
| author | Filipe Manana | 2014-10-09 22:18:55 +0200 |
|---|---|---|
| committer | Chris Mason | 2014-11-21 02:14:27 +0100 |
| commit | 075bdbdbe9f21d68950ba5b187f80a4a23105365 (patch) | |
| tree | 7a8cee33816ea7de60795f985068a176340e660d /fs/btrfs/inode.c | |
| parent | Btrfs: make inode.c:compress_file_range() return void (diff) | |
| download | kernel-qcow2-linux-075bdbdbe9f21d68950ba5b187f80a4a23105365.tar.gz kernel-qcow2-linux-075bdbdbe9f21d68950ba5b187f80a4a23105365.tar.xz kernel-qcow2-linux-075bdbdbe9f21d68950ba5b187f80a4a23105365.zip | |
Btrfs: correctly flush compressed data before/after direct IO
For compressed writes, after doing the first filemap_fdatawrite_range() we
don't get the pages tagged for writeback immediately. Instead we create
a workqueue task, which is run by other kthread, and keep the pages locked.
That other kthread compresses data, creates the respective ordered extent/s,
tags the pages for writeback and unlocks them. Therefore we need a second
call to filemap_fdatawrite_range() if we have compressed writes, as this
second call will wait for the pages to become unlocked, then see they became
tagged for writeback and finally wait for the writeback to finish.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5a8a749b7e6b..01d223e22bb1 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7015,9 +7015,19 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend, btrfs_put_ordered_extent(ordered); } else { /* Screw you mmap */ - ret = filemap_write_and_wait_range(inode->i_mapping, - lockstart, - lockend); + ret = filemap_fdatawrite_range(inode->i_mapping, + lockstart, + lockend); + if (!ret && test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT, + &BTRFS_I(inode)->runtime_flags)) + ret = filemap_fdatawrite_range(inode->i_mapping, + lockstart, + lockend); + if (ret) + break; + ret = filemap_fdatawait_range(inode->i_mapping, + lockstart, + lockend); if (ret) break; |