2023-08-10 09:11:31

by Zhang Yi

[permalink] [raw]
Subject: [PATCH v2 09/12] jbd2: drop useless error tag in jbd2_journal_wipe()

From: Zhang Yi <[email protected]>

no_recovery is redundant, just drop it.

Signed-off-by: Zhang Yi <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
---
fs/jbd2/journal.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index e2bf6f260500..4a07b3a7561e 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2497,12 +2497,12 @@ int jbd2_journal_flush(journal_t *journal, unsigned int flags)

int jbd2_journal_wipe(journal_t *journal, int write)
{
- int err = 0;
+ int err;

J_ASSERT (!(journal->j_flags & JBD2_LOADED));

if (!journal->j_tail)
- goto no_recovery;
+ return 0;

printk(KERN_WARNING "JBD2: %s recovery information on journal\n",
write ? "Clearing" : "Ignoring");
@@ -2515,7 +2515,6 @@ int jbd2_journal_wipe(journal_t *journal, int write)
mutex_unlock(&journal->j_checkpoint_mutex);
}

- no_recovery:
return err;
}

--
2.34.3