ext4: fix wrong return err in ext4_load_and_init_journal()

The return value is wrong in ext4_load_and_init_journal(). The local
variable 'err' need to be initialized before goto out. The original code
in __ext4_fill_super() is fine because it has two return values 'ret'
and 'err' and 'ret' is initialized as -EINVAL. After we factor out
ext4_load_and_init_journal(), this code is broken. So fix it by directly
returning -EINVAL in the error handler path.

Cc: [email protected]
Fixes: 9c1dd22d7422 ("ext4: factor out ext4_load_and_init_journal()")
Signed-off-by: Jason Yan <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Theodore Ts'o <[email protected]>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index d733db8a0b026258b590219b8e9cc76f4ffffe9a..6ddebc9f1b90ebf5c1563a61c040af3f69af661c 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4886,7 +4886,7 @@ out:
        flush_work(&sbi->s_error_work);
        jbd2_journal_destroy(sbi->s_journal);
        sbi->s_journal = NULL;
-       return err;
+       return -EINVAL;
 }
 
 static int ext4_journal_data_mode_check(struct super_block *sb)