diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 02:39:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 02:39:35 +0300 |
| commit | 175d58cfed70f132b8d4df39e19267ad6094bd16 (patch) | |
| tree | 9eca7048d9d81c0be1f23dfd558a3959ae4d5521 /fs/btrfs/transaction.c | |
| parent | 38aa0a59a6669af702c523e1d525b24ff5fd471b (diff) | |
| parent | 7d35199e15b82a4d1a20049153b03e6258ce79f7 (diff) | |
| download | linux-175d58cfed70f132b8d4df39e19267ad6094bd16.tar.xz | |
Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"These are small and assorted. Neil's is the oldest, I dropped the
ball thinking he was going to send it in"
* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: support NFSv2 export
Btrfs: open_ctree: Fix possible memory leak
Btrfs: fix deadlock when finalizing block group creation
Btrfs: update fix for read corruption of compressed and shared extents
Btrfs: send, fix corner case for reference overwrite detection
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 74bc3338418b..a5b06442f0bf 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -557,6 +557,7 @@ again: h->delayed_ref_elem.seq = 0; h->type = type; h->allocating_chunk = false; + h->can_flush_pending_bgs = true; h->reloc_reserved = false; h->sync = false; INIT_LIST_HEAD(&h->qgroup_ref_list); |