diff options
| author | Guoqing Cai <u202112087@hust.edu.cn> | 2023-04-13 17:57:39 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-07-29 17:52:19 -0400 |
| commit | 1d40165047456923fa4343d519353d9440cd68df (patch) | |
| tree | 09ba7657102357d1bf960f27c67793ec02cfd2bb /fs/jbd2 | |
| parent | bedc5d34632c21b5adb8ca7143d4c1f794507e4c (diff) | |
| download | linux-stable-1d40165047456923fa4343d519353d9440cd68df.tar.gz linux-stable-1d40165047456923fa4343d519353d9440cd68df.tar.bz2 linux-stable-1d40165047456923fa4343d519353d9440cd68df.zip | |
fs: jbd2: fix an incorrect warn log
In jbd2_journal_load(), when journal_reset fails, it prints an incorrect
warn log.
Fix this by changing the goto statement to return statement.
Also, return actual error code from jbd2_journal_recover() and journal_reset().
Signed-off-by: Guoqing Cai <u202112087@hust.edu.cn>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230413095740.2222066-1-u202112087@hust.edu.cn
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index fbce16fedaa4..5c223032f77a 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2089,8 +2089,11 @@ int jbd2_journal_load(journal_t *journal) /* Let the recovery code check whether it needs to recover any * data from the journal. */ - if (jbd2_journal_recover(journal)) - goto recovery_error; + err = jbd2_journal_recover(journal); + if (err) { + pr_warn("JBD2: journal recovery failed\n"); + return err; + } if (journal->j_failed_commit) { printk(KERN_ERR "JBD2: journal transaction %u on %s " @@ -2107,15 +2110,14 @@ int jbd2_journal_load(journal_t *journal) /* OK, we've finished with the dynamic journal bits: * reinitialise the dynamic contents of the superblock in memory * and reset them on disk. */ - if (journal_reset(journal)) - goto recovery_error; + err = journal_reset(journal); + if (err) { + pr_warn("JBD2: journal reset failed\n"); + return err; + } journal->j_flags |= JBD2_LOADED; return 0; - -recovery_error: - printk(KERN_WARNING "JBD2: recovery failed\n"); - return -EIO; } /** |