diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-09 19:52:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-09 19:52:31 (GMT) |
| commit | f4a9c169c29efea31b22aec0012ad29df6cf84d4 (patch) | |
| tree | cc26d338a7a752b63351972ca1aa14dfe0bbdf0e /block/blk-merge.c | |
| parent | 067c2f472d81b8b235176ce8e2cb221c4edc1a9e (diff) | |
| parent | b7f3c7d345f72240055efcdf4111fb2e0d01be99 (diff) | |
| download | linux-f4a9c169c29efea31b22aec0012ad29df6cf84d4.tar.xz | |
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"I'm not proud of how long it took me to track down that one liner in
btrfs_sync_log(), but the good news is the patches I was trying to
blame for these problems were actually fine (sorry Filipe)"
* 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: introduce tickets_id to determine whether asynchronous metadata reclaim work makes progress
btrfs: remove root_log_ctx from ctx list before btrfs_sync_log returns
btrfs: do not decrease bytes_may_use when replaying extents
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions