Linux-XFS Archive on lore.kernel.org
 help / color / Atom feed
From: Bill O'Donnell <billodo@redhat.com>
To: guaneryu@gmail.com, linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Cc: darrick.wong@oracle.com, sandeen@redhat.com
Subject: [PATCH] xfs/518: modify timer/state commands to remove new g,p timer output
Date: Fri, 31 Jul 2020 12:37:39 -0500
Message-ID: <20200731173739.390649-1-billodo@redhat.com> (raw)

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>
---
 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


             reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31 17:37 Bill O'Donnell [this message]
2020-08-09 15:41 ` Eryu Guan
2020-08-09 16:22   ` Eryu Guan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200731173739.390649-1-billodo@redhat.com \
    --to=billodo@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=fstests@vger.kernel.org \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-XFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-xfs/0 linux-xfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-xfs linux-xfs/ https://lore.kernel.org/linux-xfs \
		linux-xfs@vger.kernel.org
	public-inbox-index linux-xfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-xfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git