Skip to contentSkip to conversation

Btrfs pull part two

GIT PULL Chris Mason 1 participant 1 message Dec 19, 2014 Btrfs file system

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull my for-linus branch:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus

It has 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.

Filipe Manana (4) commits (+20/-25):
Btrfs: fix fs corruption on transaction abort if device supports discard (+6/-10)
Btrfs: always clear a block group node when removing it from the tree (+3/-0)
Btrfs: remove non-sense btrfs_error_discard_extent() function (+6/-12)
Btrfs: ensure deletion from pinned_chunks list is protected (+5/-3)

Total: (4) commits (+20/-25)

 fs/btrfs/ctree.h            |  4 ++--
 fs/btrfs/disk-io.c          |  6 ------
 fs/btrfs/extent-tree.c      | 23 +++++++++++------------
 fs/btrfs/free-space-cache.c | 12 +++++++-----
 4 files changed, 20 insertions(+), 25 deletions(-)