From: Jan Kara <jack@suse.cz>
To: fstests@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>
Subject: [PATCH 3/6] xfs/310: Cleanup
Date: Tue, 29 May 2018 18:55:58 +0200 [thread overview]
Message-ID: <20180529165601.32133-4-jack@suse.cz> (raw)
In-Reply-To: <20180529165601.32133-1-jack@suse.cz>
Cleanup couple of things that were objected to when creating test
ext4/033 out of this one.
Use _require_scratch_nocheck instead of recreating scratch fs before
exiting. Avoid needless cleanup of dmhugedev on exit - _cleanup
takes care of that. Use _scratch_unmount where possible.
Signed-off-by: Jan Kara <jack@suse.cz>
---
tests/xfs/310 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/xfs/310 b/tests/xfs/310
index f33a15ad028c..5c1f20ce453c 100755
--- a/tests/xfs/310
+++ b/tests/xfs/310
@@ -35,7 +35,6 @@ _cleanup()
umount $SCRATCH_MNT > /dev/null 2>&1
_dmhugedisk_cleanup
rm -rf $tmp.*
- _scratch_mkfs >/dev/null 2>&1
}
# get standard environment, filters and checks
@@ -46,7 +45,7 @@ _cleanup()
# real QA test starts here
_supported_os Linux
_supported_fs xfs
-_require_scratch
+_require_scratch_nocheck
_require_xfs_scratch_rmapbt
_require_xfs_io_command "falloc"
@@ -60,7 +59,7 @@ _scratch_mount >> $seqres.full
testdir=$SCRATCH_MNT/test-$seq
blksz="$(_get_block_size $SCRATCH_MNT)"
-umount $SCRATCH_MNT
+_scratch_unmount
echo "Format huge device"
nr_blks=2100000 # 2^21 plus a little more
@@ -110,7 +109,6 @@ test $nr_rmaps -eq 1 || xfs_db -c 'agf 0' -c 'addr rmaproot' -c 'p' $DMHUGEDISK_
echo "Check and fake-repair huge filesystem again" | tee -a $seqres.full
$XFS_DB_PROG -c 'check' $DMHUGEDISK_DEV
$XFS_REPAIR_PROG -n $DMHUGEDISK_DEV >> $seqres.full 2>&1
-_dmhugedisk_cleanup
echo "Done"
--
2.13.6
next prev parent reply other threads:[~2018-05-29 16:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 16:55 [PATCH 0/6] ext4: Test for resize overflow Jan Kara
2018-05-29 16:55 ` [PATCH 1/6] dmhugedisk: Allow specifying of chunk size Jan Kara
2018-05-29 16:55 ` [PATCH 2/6] ext4: Test for s_inodes_count overflow during fs resize Jan Kara
2018-05-29 16:55 ` Jan Kara [this message]
2018-05-29 22:01 ` [PATCH 3/6] xfs/310: Cleanup Dave Chinner
2018-05-29 16:55 ` [PATCH 4/6] ext4/032: Fix up resize2fs usage Jan Kara
2018-05-29 16:56 ` [PATCH 5/6] ext4/010: Fixup resize2fs and dumpe2fs usage Jan Kara
2018-05-29 16:56 ` [PATCH 6/6] ext4/306: Fixup resize2fs usage Jan Kara
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=20180529165601.32133-4-jack@suse.cz \
--to=jack@suse.cz \
--cc=fstests@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.