Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 3 Aug 2023 17:49:54 +0200
From:   Jan Kara <jack@suse.cz>
To:     Zhang Yi <yi.zhang@huaweicloud.com>
Cc:     linux-ext4@vger.kernel.org, tytso@mit.edu,
        adilger.kernel@dilger.ca, jack@suse.cz, yi.zhang@huawei.com,
        chengzhihao1@huawei.com, yukuai3@huawei.com
Subject: Re: [PATCH 09/12] jbd2: drop useless error tag in jbd2_journal_wipe()
Message-ID: <20230803154954.6rhr4m4qqer2si6r@quack3>
References: <20230704134233.110812-1-yi.zhang@huaweicloud.com>
 <20230704134233.110812-10-yi.zhang@huaweicloud.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230704134233.110812-10-yi.zhang@huaweicloud.com>
Precedence: bulk

On Tue 04-07-23 21:42:30, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@huawei.com>
> 
> no_recovery is redundant, just drop it.
> 
> Signed-off-by: Zhang Yi <yi.zhang@huawei.com>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  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 065b5e789299..cc344b8d7476 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -2506,12 +2506,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");
> @@ -2524,7 +2524,6 @@ int jbd2_journal_wipe(journal_t *journal, int write)
>  		mutex_unlock(&journal->j_checkpoint_mutex);
>  	}
>  
> - no_recovery:
>  	return err;
>  }
>  
> -- 
> 2.39.2
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR