Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "This fixes some lockups in btrfs reported with rc1. It probably has some performance impact because it is backing off our spinning locks more often and switching to a blocking lock. I'll be able to nail that down next week, but for now I want to get the lockups taken care of. Otherwise some more stack reduction and assorted fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix wrong error handle when the device is missing or is not writeable Btrfs: fix deadlock when mounting a degraded fs Btrfs: use bio_endio_nodec instead of open code Btrfs: fix NULL pointer crash when running balance and scrub concurrently btrfs: Skip scrubbing removed chunks to avoid -ENOENT. Btrfs: fix broken free space cache after the system crashed Btrfs: make free space cache write out functions more readable Btrfs: remove unused wait queue in struct extent_buffer Btrfs: fix deadlocks with trylock on tree nodes
No related branches found
No related tags found
Showing
- fs/btrfs/ctree.h 11 additions, 2 deletionsfs/btrfs/ctree.h
- fs/btrfs/extent-tree.c 112 additions, 31 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.h 0 additions, 1 deletionfs/btrfs/extent_io.h
- fs/btrfs/extent_map.c 2 additions, 0 deletionsfs/btrfs/extent_map.c
- fs/btrfs/extent_map.h 1 addition, 0 deletionsfs/btrfs/extent_map.h
- fs/btrfs/free-space-cache.c 126 additions, 66 deletionsfs/btrfs/free-space-cache.c
- fs/btrfs/inode.c 30 additions, 11 deletionsfs/btrfs/inode.c
- fs/btrfs/locking.c 46 additions, 34 deletionsfs/btrfs/locking.c
- fs/btrfs/scrub.c 9 additions, 10 deletionsfs/btrfs/scrub.c
- fs/btrfs/volumes.c 19 additions, 17 deletionsfs/btrfs/volumes.c
- fs/btrfs/volumes.h 3 additions, 0 deletionsfs/btrfs/volumes.h
Loading
Please register or sign in to comment