[XFS] Fix remount vs no/barrier options by ensuring we clear unwanted