xfs/30[78]: fix regressions due to strengthened AGF checks