Merge branch 'xfs-bulkstat-refactor' into for-next