From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eryu Guan <guaneryu@gmail.com>
Cc: zlang@redhat.com, fstests <fstests@vger.kernel.org>,
xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH] generic/587: fix rounding error in quota/stat block comparison
Date: Wed, 18 Mar 2020 08:01:42 -0700 [thread overview]
Message-ID: <20200318150142.GA256607@magnolia> (raw)
From: Darrick J. Wong <darrick.wong@oracle.com>
It turns out that repquota (which reports in units of 1k blocks) reports
rounded up numbers when the fs blocksize is 512 bytes. However, xfs_io
stat always reports block counts in units of 512 bytes. If the number
of (512b) file blocks is not an even number, the "$3 / 2" expression
will round down, causing the test to fail. Round up to the nearest 1k
to match repquota's behavior.
Reported-by: zlang@redhat.com
Fixes: 6b04ed05456fc6c ("generic: test unwritten extent conversion extent mapping quota accounting")
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/generic/587 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/generic/587 b/tests/generic/587
index 7b07d07d..2ffa367d 100755
--- a/tests/generic/587
+++ b/tests/generic/587
@@ -57,7 +57,8 @@ check_quota_accounting()
{
$XFS_IO_PROG -c stat $testfile > $tmp.out
cat $tmp.out >> $seqres.full
- local stat_blocks=$(grep 'stat.blocks' $tmp.out | awk '{print $3 / 2}')
+ local stat_blocks=$(grep 'stat.blocks' $tmp.out | \
+ awk '{printf("%d\n", ($3 + 1) / 2);}')
_report_quota_blocks $SCRATCH_MNT > $tmp.out
cat $tmp.out >> $seqres.full
next reply other threads:[~2020-03-18 15:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 15:01 Darrick J. Wong [this message]
2020-03-18 19:35 ` [PATCH] generic/587: fix rounding error in quota/stat block comparison Zorro Lang
2020-03-18 20:11 ` [PATCH v2] " Darrick J. Wong
2020-03-19 4:05 ` Zorro Lang
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=20200318150142.GA256607@magnolia \
--to=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox