Merge branch 'xfs-4.8-dir2-sf-fixes' into for-next