From c28b406918d48604e33375bec85c58b2c48296e9 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 29 Jun 2017 21:58:12 -0700 Subject: [PATCH] ext4: don't online scrub ever The ext4 online scrub program is no longer under active development, so remove all the test code that tried to use it. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/fuzzy | 4 ++-- tests/ext4/023 | 7 ++++--- tests/ext4/023.out | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common/fuzzy b/common/fuzzy index 304268e4..ea22c3ef 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -58,7 +58,7 @@ _scratch_fuzz_test() { # Do we have an online scrub program? _require_scrub() { case "${FSTYP}" in - "xfs"|"ext4") + "xfs") test -x "$XFS_SCRUB_PROG" || _notrun "xfs_scrub not found" ;; *) @@ -70,7 +70,7 @@ _require_scrub() { # Scrub the scratch filesystem metadata (online) _scratch_scrub() { case "${FSTYP}" in - "xfs"|"ext4"|"ext3"|"ext2") + "xfs") $XFS_SCRUB_PROG -d -T -v "$@" $SCRATCH_MNT ;; *) diff --git a/tests/ext4/023 b/tests/ext4/023 index 4f5cf3ed..7ca3d7de 100755 --- a/tests/ext4/023 +++ b/tests/ext4/023 @@ -1,7 +1,9 @@ #! /bin/bash # FS QA Test No. 023 # -# Populate a ext4 filesystem and ensure that scrub and repair are happy. +# Ensure that the populate helpers actually /can/ populate a ext4 +# filesystem with all types of metadata and create an image of the +# metadata. Check that fsck is happy with the resulting fs. # #----------------------------------------------------------------------- # Copyright (c) 2017 Oracle, Inc. All Rights Reserved. @@ -51,9 +53,8 @@ _require_scrub echo "Format and populate" _scratch_populate_cached > $seqres.full 2>&1 -echo "Scrub" +echo "Mount" _scratch_mount >> $seqres.full 2>&1 -_scratch_scrub >> $seqres.full # success, all done status=0 diff --git a/tests/ext4/023.out b/tests/ext4/023.out index da2bd60d..8a7659be 100644 --- a/tests/ext4/023.out +++ b/tests/ext4/023.out @@ -1,3 +1,3 @@ QA output created by 023 Format and populate -Scrub +Mount -- 2.39.5