[XFS] fixups after behavior removal merge into mainline git