Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "Eric's rcu barrier patch fixes a long standing problem with our unmount code hanging on to devices in workqueue helpers. Liu Bo nailed down a difficult assertion for in-memory extent mappings." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix warning of free_extent_map Btrfs: fix warning when creating snapshots Btrfs: return as soon as possible when edquot happens Btrfs: return EIO if we have extent tree corruption btrfs: use rcu_barrier() to wait for bdev puts at unmount Btrfs: remove btrfs_try_spin_lock Btrfs: get better concurrency for snapshot-aware defrag work
Showing
- fs/btrfs/extent-tree.c 4 additions, 1 deletionfs/btrfs/extent-tree.c
- fs/btrfs/file.c 1 addition, 0 deletionsfs/btrfs/file.c
- fs/btrfs/inode.c 3 additions, 0 deletionsfs/btrfs/inode.c
- fs/btrfs/locking.h 0 additions, 1 deletionfs/btrfs/locking.h
- fs/btrfs/qgroup.c 6 additions, 4 deletionsfs/btrfs/qgroup.c
- fs/btrfs/transaction.c 5 additions, 6 deletionsfs/btrfs/transaction.c
- fs/btrfs/volumes.c 6 additions, 0 deletionsfs/btrfs/volumes.c
Loading
Please register or sign in to comment