Merge branch 'xfs-libxfs-restructure' into for-next

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_bmap.h
Simple merge

diff --cc fs/xfs/libxfs/xfs_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_sb.c
Simple merge

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc fs/xfs/xfs_iomap.c
Simple merge