Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs cleanups and fixes from Chris Mason: "These are small cleanups, and also some fixes for our async worker thread initialization. I was having some trouble testing these, but it ended up being a combination of changing around my test servers and a shiny new schedule while atomic from the new start/finish_plug in writeback_sb_inodes(). That one only hits on btrfs raid5/6 or MD raid10, and if I wasn't changing a bunch of things in my test setup at once it would have been really clear. Fix for writeback_sb_inodes() on the way as well" * 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: cleanup: remove unnecessary check before btrfs_free_path is called btrfs: async_thread: Fix workqueue 'max_active' value when initializing btrfs: Add raid56 support for updating num_tolerated_disk_barrier_failures in btrfs_balance btrfs: Cleanup for btrfs_calc_num_tolerated_disk_barrier_failures btrfs: Remove noused chunk_tree and chunk_objectid from scrub_enumerate_chunks and scrub_chunk btrfs: Update out-of-date "skip parity stripe" comment
No related branches found
No related tags found
Showing
- fs/btrfs/async-thread.c 34 additions, 23 deletionsfs/btrfs/async-thread.c
- fs/btrfs/async-thread.h 1 addition, 1 deletionfs/btrfs/async-thread.h
- fs/btrfs/dev-replace.c 1 addition, 2 deletionsfs/btrfs/dev-replace.c
- fs/btrfs/disk-io.c 36 additions, 40 deletionsfs/btrfs/disk-io.c
- fs/btrfs/disk-io.h 1 addition, 0 deletionsfs/btrfs/disk-io.h
- fs/btrfs/inode.c 1 addition, 2 deletionsfs/btrfs/inode.c
- fs/btrfs/scrub.c 3 additions, 9 deletionsfs/btrfs/scrub.c
- fs/btrfs/tree-defrag.c 1 addition, 2 deletionsfs/btrfs/tree-defrag.c
- fs/btrfs/volumes.c 4 additions, 17 deletionsfs/btrfs/volumes.c
Loading
Please register or sign in to comment