xfs/518: modify timer/state commands to remove new g,p timer output

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@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Bill O'Donnell
2020-07-31 12:37:39 -05:00
committed by Eryu Guan
parent 912521c9fa
commit 7cee3f1728
+4 -4
View File
@@ -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