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:   Tue, 11 Apr 2023 12:26:45 +0200
From:   Jan Kara <jack@suse.cz>
To:     "Darrick J. Wong" <djwong@kernel.org>
Cc:     Guoqing Cai <u202112087@hust.edu.cn>,
        Theodore Ts'o <tytso@mit.edu>, Jan Kara <jack@suse.com>,
        HUST OS Kernel Contribution 
        <hust-os-kernel-patches@googlegroups.com>,
        Dongliang Mu <dzm91@hust.edu.cn>, linux-ext4@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fs: jbd2: fix an incorrect warn log
Message-ID: <20230411102645.geqbaksm2yxuevjg@quack3>
References: <20230410172039.1752440-1-u202112087@hust.edu.cn>
 <20230410174545.GA360877@frogsfrogsfrogs>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230410174545.GA360877@frogsfrogsfrogs>
Precedence: bulk

On Mon 10-04-23 10:45:45, Darrick J. Wong wrote:
> On Tue, Apr 11, 2023 at 01:20:38AM +0800, Guoqing Cai wrote:
> > In jbd2_journal_load(), when journal_reset fails, it prints an incorrect
> > warn log.
> > 
> > Fix this by changing the goto statement to return statement.
> > 
> > Signed-off-by: Guoqing Cai <u202112087@hust.edu.cn>
> > Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
> > ---
> >  fs/jbd2/journal.c | 12 +++++-------
> >  1 file changed, 5 insertions(+), 7 deletions(-)
> > 
> > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> > index e80c781731f8..555f09ca1d99 100644
> > --- a/fs/jbd2/journal.c
> > +++ b/fs/jbd2/journal.c
> > @@ -2082,8 +2082,10 @@ 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;
> > +	if (jbd2_journal_recover(journal)) {
> > +		printk(KERN_WARNING "JBD2: recovery failed\n");
> > +		return -EIO;
> > +	}
> >  
> >  	if (journal->j_failed_commit) {
> >  		printk(KERN_ERR "JBD2: journal transaction %u on %s "
> > @@ -2101,14 +2103,10 @@ int jbd2_journal_load(journal_t *journal)
> >  	 * reinitialise the dynamic contents of the superblock in memory
> >  	 * and reset them on disk. */
> >  	if (journal_reset(journal))
> > -		goto recovery_error;
> > +		return -EIO;
> 
> Why wouldn't you warn about the journal reset failing here?

Well, ext4 will still print:

	ext4_msg(sb, KERN_ERR, "error loading journal");

which I guess is good enough for such strange failure.

								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR