summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorZhang Yi <yi.zhang@huawei.com>2023-08-11 14:36:07 +0800
committerTheodore Ts'o <tytso@mit.edu>2023-08-15 09:00:34 -0400
commitd9a45496019a73c240bd22912ae18a04b8496364 (patch)
treecbf976bd378dbc4e2084f141a2eadce69f218fca /fs/jbd2
parent49887e47a5262cc7b87d547de57a21a072c6ea5e (diff)
downloadlinux-stable-d9a45496019a73c240bd22912ae18a04b8496364.tar.gz
linux-stable-d9a45496019a73c240bd22912ae18a04b8496364.tar.bz2
linux-stable-d9a45496019a73c240bd22912ae18a04b8496364.zip
jbd2: drop useless error tag in jbd2_journal_wipe()
no_recovery is redundant, just drop it. Signed-off-by: Zhang Yi <yi.zhang@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20230811063610.2980059-10-yi.zhang@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/journal.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 04b67844118c..6482fcca3dc6 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2500,12 +2500,12 @@ out:
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");
@@ -2518,7 +2518,6 @@ int jbd2_journal_wipe(journal_t *journal, int write)
mutex_unlock(&journal->j_checkpoint_mutex);
}
- no_recovery:
return err;
}