diff options
author | Joerg Roedel <jroedel@suse.de> | 2014-09-03 17:58:50 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2014-09-03 17:58:50 +0200 |
commit | 61bf5ff07afb28a028ca5b9fb3c7ef29fc47d0d6 (patch) | |
tree | f3d0d1ddb6320f39910a9b9677dbefe9ed80f5e0 /fs/btrfs/ordered-data.c | |
parent | c0df975f9045d6b2b13d88746e628ac308ff49ea (diff) | |
parent | 4d09d99d543ec28b2280a1f62382697f47ea6366 (diff) | |
download | op-kernel-dev-61bf5ff07afb28a028ca5b9fb3c7ef29fc47d0d6.zip op-kernel-dev-61bf5ff07afb28a028ca5b9fb3c7ef29fc47d0d6.tar.gz |
Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into iommu/fixes
Diffstat (limited to 'fs/btrfs/ordered-data.c')
-rw-r--r-- | fs/btrfs/ordered-data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 963895c..ac734ec 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -615,6 +615,7 @@ int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr) spin_unlock(&root->ordered_extent_lock); btrfs_init_work(&ordered->flush_work, + btrfs_flush_delalloc_helper, btrfs_run_ordered_extent_work, NULL, NULL); list_add_tail(&ordered->work_list, &works); btrfs_queue_work(root->fs_info->flush_workers, |