diff options
| author | Chris Mason | 2016-05-17 23:43:19 +0200 |
|---|---|---|
| committer | Chris Mason | 2016-05-17 23:43:19 +0200 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /fs/btrfs/transaction.c | |
| parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Btrfs: add semaphore to synchronize direct IO writes with fsync (diff) | |
| download | kernel-qcow2-linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.gz kernel-qcow2-linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.xz kernel-qcow2-linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.zip | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index abf3a4604ac6..5b0b758a3f79 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1907,7 +1907,7 @@ static inline int btrfs_start_delalloc_flush(struct btrfs_fs_info *fs_info) static inline void btrfs_wait_delalloc_flush(struct btrfs_fs_info *fs_info) { if (btrfs_test_opt(fs_info->tree_root, FLUSHONCOMMIT)) - btrfs_wait_ordered_roots(fs_info, -1); + btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1); } static inline void |