Received-SPF: pass (google.com: domain of linux-ext4+bounces-197-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 27 Nov 2023 17:02:15 +0100
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 1/2] jbd2: correct the printing of write_flags in
 jbd2_write_superblock()
Message-ID: <20231127160215.7wyowq5nt6ss2xgk@quack3>
References: <20231125121740.1035816-1-yi.zhang@huaweicloud.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231125121740.1035816-1-yi.zhang@huaweicloud.com>

On Sat 25-11-23 20:17:38, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@huawei.com>
> 
> The write_flags print in the trace of jbd2_write_superblock() is not
> real, so move the modification before the trace.
> 
> Signed-off-by: Zhang Yi <yi.zhang@huawei.com>

Good catch. Feel free to add:

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

								Honza

> ---
>  fs/jbd2/journal.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index 30dec2bd2ecc..e7aa47a02d4d 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -1791,9 +1791,11 @@ static int jbd2_write_superblock(journal_t *journal, blk_opf_t write_flags)
>  		return -EIO;
>  	}
>  
> -	trace_jbd2_write_superblock(journal, write_flags);
>  	if (!(journal->j_flags & JBD2_BARRIER))
>  		write_flags &= ~(REQ_FUA | REQ_PREFLUSH);
> +
> +	trace_jbd2_write_superblock(journal, write_flags);
> +
>  	if (buffer_write_io_error(bh)) {
>  		/*
>  		 * Oh, dear.  A previous attempt to write the journal
> -- 
> 2.39.2
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR