Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "The important part of this pull is Filipe's set of fixes for btrfs device replacement. Filipe fixed a few issues seen on the list and a number he found on his own" * 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: deal with duplciates during extent_map insertion in btrfs_get_extent Btrfs: fix race between device replace and read repair Btrfs: fix race between device replace and discard Btrfs: fix race between device replace and chunk allocation Btrfs: fix race setting block group back to RW mode during device replace Btrfs: fix unprotected assignment of the left cursor for device replace Btrfs: fix race setting block group readonly during device replace Btrfs: fix race between device replace and block group removal Btrfs: fix race between readahead and device replace/removal
No related branches found
No related tags found
Showing
- fs/btrfs/extent-tree.c 6 additions, 0 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.c 10 additions, 0 deletionsfs/btrfs/extent_io.c
- fs/btrfs/inode.c 12 additions, 1 deletionfs/btrfs/inode.c
- fs/btrfs/ordered-data.c 5 additions, 1 deletionfs/btrfs/ordered-data.c
- fs/btrfs/ordered-data.h 1 addition, 1 deletionfs/btrfs/ordered-data.h
- fs/btrfs/reada.c 2 additions, 0 deletionsfs/btrfs/reada.c
- fs/btrfs/scrub.c 47 additions, 3 deletionsfs/btrfs/scrub.c
- fs/btrfs/volumes.c 20 additions, 12 deletionsfs/btrfs/volumes.c
Loading
Please register or sign in to comment