diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 18:10:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 18:10:42 -0800 |
| commit | 5c68eac68bea2fc908b20b6df8654d50bd1a5d36 (patch) | |
| tree | 58d074590fc918efe05c85c8d98055ec4d747b59 /fs/ecryptfs/file.c | |
| parent | 20e471fd34d1f79bed65fdc1bf4ad090f70472a5 (diff) | |
| parent | 1edb647bb95439d90c0017e9ca23c4ecf00a0409 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull more btrfs updates from Chris Mason:
"This is part two of our merge window patches.
These are all from Filipe, and fix some really hard to find races that
can cause corruptions. Most of them involved block group removal
(balance) or discard"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: remove non-sense btrfs_error_discard_extent() function
Btrfs: fix fs corruption on transaction abort if device supports discard
Btrfs: always clear a block group node when removing it from the tree
Btrfs: ensure deletion from pinned_chunks list is protected
Diffstat (limited to 'fs/ecryptfs/file.c')
0 files changed, 0 insertions, 0 deletions