Commit 9f23e289 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason

Btrfs: make sure the delalloc workers actually flush compressed writes

When using delalloc workers in a non-waiting way (like for enospc handling) we
can end up not actually waiting for the dirty pages to be started if we have
compression.  We need to add an extra filemap flush to make sure any async
extents that have started are actually moved along before returning.  Thanks,
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 93858769
...@@ -8163,18 +8163,24 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -8163,18 +8163,24 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
static void btrfs_run_delalloc_work(struct btrfs_work *work) static void btrfs_run_delalloc_work(struct btrfs_work *work)
{ {
struct btrfs_delalloc_work *delalloc_work; struct btrfs_delalloc_work *delalloc_work;
struct inode *inode;
delalloc_work = container_of(work, struct btrfs_delalloc_work, delalloc_work = container_of(work, struct btrfs_delalloc_work,
work); work);
if (delalloc_work->wait) inode = delalloc_work->inode;
btrfs_wait_ordered_range(delalloc_work->inode, 0, (u64)-1); if (delalloc_work->wait) {
else btrfs_wait_ordered_range(inode, 0, (u64)-1);
filemap_flush(delalloc_work->inode->i_mapping); } else {
filemap_flush(inode->i_mapping);
if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,
&BTRFS_I(inode)->runtime_flags))
filemap_flush(inode->i_mapping);
}
if (delalloc_work->delay_iput) if (delalloc_work->delay_iput)
btrfs_add_delayed_iput(delalloc_work->inode); btrfs_add_delayed_iput(inode);
else else
iput(delalloc_work->inode); iput(inode);
complete(&delalloc_work->completion); complete(&delalloc_work->completion);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment