New xfs_quota kernel and xfsprogs add grace timers for group and project, in addition to existing user quota. Adjust xfs/518 to accommodate those changes, and avoid regression. Signed-off-by: Bill O'Donnell <billodo@xxxxxxxxxx> --- tests/xfs/518 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/xfs/518 b/tests/xfs/518 index da39d8dc..c49c4e4d 100755 --- a/tests/xfs/518 +++ b/tests/xfs/518 @@ -41,12 +41,12 @@ _qmount_option "usrquota" _scratch_mount >> $seqres.full $XFS_QUOTA_PROG -x -c 'timer -u 300m' $SCRATCH_MNT -$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time' +$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time' _scratch_unmount # Remount and check the limits _scratch_mount >> $seqres.full -$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time' +$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time' _scratch_unmount # Run repair to force quota check @@ -57,12 +57,12 @@ _scratch_xfs_repair >> $seqres.full 2>&1 # while the incore copy stays at whatever was read in prior to quotacheck. # This will show up after the /next/ remount. _scratch_mount >> $seqres.full -$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time' +$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time' _scratch_unmount # Remount and check the limits _scratch_mount >> $seqres.full -$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time' +$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time' _scratch_unmount # success, all done -- 2.26.2
