defrag: test $TEST_DEV for extents for ext4 defrag

Commit 902223bdbbf2: "defrag: require extents support for ext4
defrag" added a test to make sure the ext4 file system has extents
enabled by testing the scratch device.  Unfortunately at the time
when _require_defrag is run, the scratch file system hasn't been
initialized yet by the test, so its contents are undefined.

If the previous test explicitly creates a file system with extents
disabled on $SCRATCH_DEV (such as ext4/306), then subsequent tests
(e.g., ext4/307 and ext4/306) will refuse to run.

Fix this by testing $TEST_DEV instead of $SCRATCH_DEV.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/defrag b/common/defrag
index 44fc53602029ec734fe3fa50936deb2d547cbe03..7db0cb4d02d4c98447d96463f9a79c98d5865c70 100644 (file)
--- a/common/defrag
+++ b/common/defrag
@@ -33,7 +33,7 @@ _require_defrag()
        else
                DEFRAG_PROG="$E4DEFRAG_PROG"
        fi
-       dumpe2fs -h $SCRATCH_DEV 2> /dev/null | grep -wq extent || \
+       dumpe2fs -h $TEST_DEV 2> /dev/null | grep -wq extent || \
                _notrun "file system does not have extents, needed for defrag"
        ;;
     btrfs)