Merge branch 'cleanup/misc-simplify' of git://git.kernel.org/pub/scm/linux/kernel...

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc fs/btrfs/volumes.h
Simple merge