diff options
| author | Luis Henriques (SUSE) <luis.henriques@linux.dev> | 2024-04-01 10:57:08 +0100 |
|---|---|---|
| committer | Zorro Lang <zlang@kernel.org> | 2024-04-03 19:01:42 +0800 |
| commit | e024c6f28b8bc8a507aae67e699fffb6cab1fca1 (patch) | |
| tree | 9295924564520689a1197e1c4e743e8643ab6788 | |
| parent | 8aab1f1663031cccb326ffbcb087b81bfb629df8 (diff) | |
| download | xfstests-dev-e024c6f28b8bc8a507aae67e699fffb6cab1fca1.tar.gz | |
ext4/01{2,9}: fix invalid filesystem option 'journal'
Creating an ext4 filesystem using '-O journal' will fail with:
Invalid filesystem option set: journal
Fix it by replacing it by '-O has_journal', which ensures the filesystem
(ext3 or ext4) is created with a journal. While there, also redirect stderr
and stdout to the full log.
Signed-off-by: "Luis Henriques (SUSE)" <luis.henriques@linux.dev>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Zorro Lang <zlang@kernel.org>
| -rwxr-xr-x | tests/ext4/012 | 2 | ||||
| -rwxr-xr-x | tests/ext4/019 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ext4/012 b/tests/ext4/012 index c49e8ef448..358874a1ca 100755 --- a/tests/ext4/012 +++ b/tests/ext4/012 @@ -32,7 +32,7 @@ TESTDIR="${SCRATCH_MNT}/scratchdir" TESTFILE="${TESTDIR}/testfile" echo "+ create scratch fs" -_scratch_mkfs_ext4 -O journal > /dev/null 2>&1 +_scratch_mkfs -O has_journal >> $seqres.full 2>&1 echo "+ mount fs image" _scratch_mount diff --git a/tests/ext4/019 b/tests/ext4/019 index ab5f50c66b..f051409398 100755 --- a/tests/ext4/019 +++ b/tests/ext4/019 @@ -32,7 +32,7 @@ TESTDIR="${SCRATCH_MNT}/scratchdir" TESTFILE="${TESTDIR}/testfile" echo "+ create scratch fs" -_scratch_mkfs_ext4 -O journal > /dev/null 2>&1 +_scratch_mkfs -O has_journal >> $seqres.full 2>&1 echo "+ mount fs image" _scratch_mount |