[XFS] Merge in trivial changes, sync up headers with userspace