Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "This has our collection of bug fixes. I missed the last rc because I thought our patches were making NFS crash during my xfs test runs. Turns out it was an NFS client bug fixed by someone else while I tried to bisect it. All of these fixes are small, but some are fairly high impact. The biggest are fixes for our mount -o remount handling, a deadlock due to GFP_KERNEL allocations in readdir, and a RAID10 error handling bug. This was tested against both 3.3 and Linus' master as of this morning." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (26 commits) Btrfs: reduce lock contention during extent insertion Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir Btrfs: Fix space checking during fs resize Btrfs: fix block_rsv and space_info lock ordering Btrfs: Prevent root_list corruption Btrfs: fix repair code for RAID10 Btrfs: do not start delalloc inodes during sync Btrfs: fix that check_int_data mount option was ignored Btrfs: don't count CRC or header errors twice while scrubbing Btrfs: fix btrfs_ioctl_dev_info() crash on missing device btrfs: don't return EINTR Btrfs: double unlock bug in error handling Btrfs: always store the mirror we read the eb from fs/btrfs/volumes.c: add missing free_fs_devices btrfs: fix early abort in 'remount' Btrfs: fix max chunk size check in chunk allocator Btrfs: add missing read locks in backref.c Btrfs: don't call free_extent_buffer twice in iterate_irefs Btrfs: Make free_ipath() deal gracefully with NULL pointers Btrfs: avoid possible use-after-free in clear_extent_bit() ...
No related branches found
No related tags found
Showing
- fs/btrfs/backref.c 20 additions, 7 deletionsfs/btrfs/backref.c
- fs/btrfs/ctree.h 1 addition, 1 deletionfs/btrfs/ctree.h
- fs/btrfs/disk-io.c 11 additions, 11 deletionsfs/btrfs/disk-io.c
- fs/btrfs/extent-tree.c 7 additions, 8 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.c 28 additions, 28 deletionsfs/btrfs/extent_io.c
- fs/btrfs/extent_io.h 2 additions, 2 deletionsfs/btrfs/extent_io.h
- fs/btrfs/file.c 7 additions, 2 deletionsfs/btrfs/file.c
- fs/btrfs/inode.c 18 additions, 36 deletionsfs/btrfs/inode.c
- fs/btrfs/ioctl.c 4 additions, 1 deletionfs/btrfs/ioctl.c
- fs/btrfs/reada.c 29 additions, 19 deletionsfs/btrfs/reada.c
- fs/btrfs/relocation.c 3 additions, 1 deletionfs/btrfs/relocation.c
- fs/btrfs/scrub.c 0 additions, 15 deletionsfs/btrfs/scrub.c
- fs/btrfs/super.c 4 additions, 3 deletionsfs/btrfs/super.c
- fs/btrfs/transaction.c 5 additions, 1 deletionfs/btrfs/transaction.c
- fs/btrfs/volumes.c 9 additions, 4 deletionsfs/btrfs/volumes.c
Loading
Please register or sign in to comment