diff mbox series

[v2] ext4/01{2,9}: fix invalid filesystem option 'journal'

Message ID 20240401095709.12304-1-luis.henriques@linux.dev (mailing list archive)
State New, archived
Headers show
Series [v2] ext4/01{2,9}: fix invalid filesystem option 'journal' | expand

Commit Message

Luis Henriques April 1, 2024, 9:57 a.m. UTC
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>
---
changes since v1 (after tytso's review):
- instead of dropping '-O journal', replace it by '-O has_journal'
- redirect std{out,err} to log
- use _scratch_mkfs instead of _scratch_mkfs_ext4

 tests/ext4/012 | 2 +-
 tests/ext4/019 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Darrick J. Wong April 1, 2024, 2:55 p.m. UTC | #1
On Mon, Apr 01, 2024 at 10:57:08AM +0100, Luis Henriques (SUSE) wrote:
> 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>

Looks ok,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
> changes since v1 (after tytso's review):
> - instead of dropping '-O journal', replace it by '-O has_journal'
> - redirect std{out,err} to log
> - use _scratch_mkfs instead of _scratch_mkfs_ext4
> 
>  tests/ext4/012 | 2 +-
>  tests/ext4/019 | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/ext4/012 b/tests/ext4/012
> index c49e8ef4483b..358874a1caf1 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 ab5f50c66b6f..f0514093981b 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
>
Theodore Ts'o April 1, 2024, 4:56 p.m. UTC | #2
On Mon, Apr 01, 2024 at 10:57:08AM +0100, Luis Henriques (SUSE) wrote:
> 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: Theodore Ts'o <tytso@mit.edu>
diff mbox series

Patch

diff --git a/tests/ext4/012 b/tests/ext4/012
index c49e8ef4483b..358874a1caf1 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 ab5f50c66b6f..f0514093981b 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