linux-kernel - Re: [RFC 4/9] ext4: Do not call FC trace event if FS does not support FC

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 23 Feb 2022 10:41:49 +0100
From:   Jan Kara <jack@...e.cz>
To:     Ritesh Harjani <riteshh@...ux.ibm.com>
Cc:     linux-ext4@...r.kernel.org,
        Harshad Shirwadkar <harshadshirwadkar@...il.com>,
        Theodore Ts'o <tytso@....edu>, Jan Kara <jack@...e.cz>,
        linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [RFC 4/9] ext4: Do not call FC trace event if FS does not
 support FC

On Wed 23-02-22 02:04:12, Ritesh Harjani wrote:
> This just puts trace_ext4_fc_commit_start(sb) & ktime_get()
> for measuring FC commit time, after the check of whether sb
> supports JOURNAL_FAST_COMMIT or not.
> 
> Signed-off-by: Ritesh Harjani <riteshh@...ux.ibm.com>

Looks good. Feel free to add:

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

								Honza

> ---
>  fs/ext4/fast_commit.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
> index bf70879bb4fe..7fb1eceef30c 100644
> --- a/fs/ext4/fast_commit.c
> +++ b/fs/ext4/fast_commit.c
> @@ -1167,13 +1167,13 @@ int ext4_fc_commit(journal_t *journal, tid_t commit_tid)
>  	int status = EXT4_FC_STATUS_OK, fc_bufs_before = 0;
>  	ktime_t start_time, commit_time;
>  
> +	if (!test_opt2(sb, JOURNAL_FAST_COMMIT))
> +		return jbd2_complete_transaction(journal, commit_tid);
> +
>  	trace_ext4_fc_commit_start(sb);
>  
>  	start_time = ktime_get();
>  
> -	if (!test_opt2(sb, JOURNAL_FAST_COMMIT))
> -		return jbd2_complete_transaction(journal, commit_tid);
> -
>  restart_fc:
>  	ret = jbd2_fc_begin_commit(journal, commit_tid);
>  	if (ret == -EALREADY) {
> -- 
> 2.31.1
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR