From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: eguan@redhat.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 2/4] xfs: skip xfs_check in _check_xfs_filesystem
Date: Wed, 07 Feb 2018 13:19:31 -0800 [thread overview]
Message-ID: <151803837117.19313.3481001926133028039.stgit@magnolia> (raw)
In-Reply-To: <151803835881.19313.17455678207236452557.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
xfs_check has been long obsolete, so stop running it automatically
after every test. Tests that explicitly want xfs_check can call it
via _scratch_xfs_check or _xfs_check; that part doesn't go away.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
common/xfs | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/common/xfs b/common/xfs
index 3dba40d..c63e5dc 100644
--- a/common/xfs
+++ b/common/xfs
@@ -386,23 +386,6 @@ _check_xfs_filesystem()
ok=0
fi
- # xfs_check runs out of memory on large files, so even providing the test
- # option (-t) to avoid indexing the free space trees doesn't make it pass on
- # large filesystems. Avoid it.
- if [ "$LARGE_SCRATCH_DEV" != yes ]; then
- _xfs_check $extra_log_options $device 2>&1 |\
- _fix_malloc >$tmp.fs_check
- fi
- if [ -s $tmp.fs_check ]; then
- _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (c)"
- echo "*** xfs_check output ***" >>$seqres.full
- cat $tmp.fs_check >>$seqres.full
- echo "*** end xfs_check output" >>$seqres.full
-
- xfs_metadump $device $seqres.check >>$seqres.full 2>&1
- ok=0
- fi
-
$XFS_REPAIR_PROG -n $extra_options $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
if [ $? -ne 0 ]; then
_log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (r)"
next prev parent reply other threads:[~2018-02-07 21:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-07 21:19 [PATCH 0/4] misc. fstests changes Darrick J. Wong
2018-02-07 21:19 ` [PATCH 1/4] xfs_scrub: remove -y parameter Darrick J. Wong
2018-02-07 21:19 ` Darrick J. Wong [this message]
2018-02-08 12:51 ` [PATCH 2/4] xfs: skip xfs_check in _check_xfs_filesystem Eryu Guan
2018-02-14 15:31 ` Eryu Guan
2018-02-14 16:34 ` Eric Sandeen
2018-02-14 17:02 ` Darrick J. Wong
2018-02-14 21:22 ` Dave Chinner
2018-02-15 0:40 ` Darrick J. Wong
2018-02-07 21:19 ` [PATCH 3/4] xfs: regression tests for reflink quota bugs Darrick J. Wong
2018-02-07 21:19 ` [PATCH 4/4] xfs/348: dir->symlink corruption must not be allowed Darrick J. Wong
2018-02-08 11:11 ` Eryu Guan
2018-02-08 16:30 ` Darrick J. Wong
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=151803837117.19313.3481001926133028039.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).