diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-23 21:14:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-23 21:14:10 +0300 |
| commit | 7ce14f6ff26460819345fe8495cf2dd6538b7cdc (patch) | |
| tree | 23fb69457c5f2c3b80aebf2a7351b57d87426c6d /net | |
| parent | cf539cbd8a81e12880735a0912de8b99f46c84fd (diff) | |
| parent | 153c35b6cccc0c72de9fae06c8e2c8b2c47d79d4 (diff) | |
| download | linux-7ce14f6ff26460819345fe8495cf2dd6538b7cdc.tar.xz | |
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"I fixed up a regression from 4.0 where conversion between different
raid levels would sometimes bail out without converting.
Filipe tracked down a race where it was possible to double allocate
chunks on the drive.
Mark has a fix for fiemap. All three will get bundled off for stable
as well"
* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix regression in raid level conversion
Btrfs: fix racy system chunk allocation when setting block group ro
btrfs: clear 'ret' in btrfs_check_shared() loop
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions