Skip to contentSkip to conversation

Btrfs

GIT PULL Chris Mason 1 participant 1 message Feb 9, 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

This is a small collection of fixes

Josef Bacik (2) commits (+4/-5):
Btrfs: don't loop forever if we can't run because of the tree mod log (+1/-0)
Btrfs: fix assert screwup for the pending move stuff (+3/-5)

David Sterba (1) commits (+1/-1):
btrfs: reserve no transaction units in btrfs_ioctl_set_features

Filipe David Borba Manana (1) commits (+2/-0):
Btrfs: fix data corruption when reading/updating compressed extents

Jeff Mahoney (1) commits (+2/-2):
btrfs: commit transaction after setting label and features

Total: (5) commits (+9/-8)

 fs/btrfs/compression.c | 2 ++
 fs/btrfs/extent-tree.c | 1 +
 fs/btrfs/ioctl.c       | 6 +++---
 fs/btrfs/send.c        | 8 +++-----
 4 files changed, 9 insertions(+), 8 deletions(-)