diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-21 10:53:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-21 10:53:37 -0700 |
| commit | 521d474631310e8aafef7953a8a7f7d1efd42da6 (patch) | |
| tree | bb9e749164b2ede690b3776d05802fd08487c963 /include | |
| parent | 0d122f7430ed4c4298e33e0d70dc4065679720a2 (diff) | |
| parent | e1cbbfa5f5aaf40a1fe70856fac4dfcc33e0e651 (diff) | |
| download | linux-521d474631310e8aafef7953a8a7f7d1efd42da6.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"Most of these are fixing extent reservation accounting, or corners
with tree writeback during commit.
Josef's set does add a test, which isn't strictly a fix, but it'll
keep us from making this same mistake again"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix outstanding_extents accounting in DIO
Btrfs: add sanity test for outstanding_extents accounting
Btrfs: just free dummy extent buffers
Btrfs: account merges/splits properly
Btrfs: prepare block group cache before writing
Btrfs: fix ASSERT(list_empty(&cur_trans->dirty_bgs_list)
Btrfs: account for the correct number of extents for delalloc reservations
Btrfs: fix merge delalloc logic
Btrfs: fix comp_oper to get right order
Btrfs: catch transaction abortion after waiting for it
btrfs: fix sizeof format specifier in btrfs_check_super_valid()
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions