Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull second set of btrfs updates from Chris Mason: "The most important changes here are from Josef, fixing a btrfs regression in 3.14 that can cause corruptions in the extent allocation tree when snapshots are in use. Josef also fixed some deadlocks in send/recv and other assorted races when balance is running" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (23 commits) Btrfs: fix compile warnings on on avr32 platform btrfs: allow mounting btrfs subvolumes with different ro/rw options btrfs: export global block reserve size as space_info btrfs: fix crash in remount(thread_pool=) case Btrfs: abort the transaction when we don't find our extent ref Btrfs: fix EINVAL checks in btrfs_clone Btrfs: fix unlock in __start_delalloc_inodes() Btrfs: scrub raid56 stripes in the right way Btrfs: don't compress for a small write Btrfs: more efficient io tree navigation on wait_extent_bit Btrfs: send, build path string only once in send_hole btrfs: filter invalid arg for btrfs resize Btrfs: send, fix data corruption due to incorrect hole detection Btrfs: kmalloc() doesn't return an ERR_PTR Btrfs: fix snapshot vs nocow writting btrfs: Change the expanding write sequence to fix snapshot related bug. btrfs: make device scan less noisy btrfs: fix lockdep warning with reclaim lock inversion Btrfs: hold the commit_root_sem when getting the commit root during send Btrfs: remove transaction from send ...
Showing
- fs/btrfs/async-thread.c 2 additions, 0 deletionsfs/btrfs/async-thread.c
- fs/btrfs/backref.c 27 additions, 6 deletionsfs/btrfs/backref.c
- fs/btrfs/ctree.c 6 additions, 88 deletionsfs/btrfs/ctree.c
- fs/btrfs/ctree.h 10 additions, 3 deletionsfs/btrfs/ctree.h
- fs/btrfs/disk-io.c 20 additions, 3 deletionsfs/btrfs/disk-io.c
- fs/btrfs/extent-tree.c 21 additions, 14 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.c 6 additions, 2 deletionsfs/btrfs/extent_io.c
- fs/btrfs/extent_io.h 1 addition, 0 deletionsfs/btrfs/extent_io.h
- fs/btrfs/file.c 4 additions, 1 deletionfs/btrfs/file.c
- fs/btrfs/inode-map.c 7 additions, 7 deletionsfs/btrfs/inode-map.c
- fs/btrfs/inode.c 32 additions, 4 deletionsfs/btrfs/inode.c
- fs/btrfs/ioctl.c 28 additions, 7 deletionsfs/btrfs/ioctl.c
- fs/btrfs/relocation.c 0 additions, 21 deletionsfs/btrfs/relocation.c
- fs/btrfs/scrub.c 89 additions, 19 deletionsfs/btrfs/scrub.c
- fs/btrfs/send.c 42 additions, 75 deletionsfs/btrfs/send.c
- fs/btrfs/super.c 22 additions, 0 deletionsfs/btrfs/super.c
- fs/btrfs/transaction.c 30 additions, 18 deletionsfs/btrfs/transaction.c
- fs/btrfs/transaction.h 3 additions, 0 deletionsfs/btrfs/transaction.h
- fs/btrfs/volumes.c 24 additions, 11 deletionsfs/btrfs/volumes.c
Loading
Please register or sign in to comment