Merge branch 'xfs-ioctl-setattr-cleanup' into for-next