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

From: Jan Kara
Date: Wed Feb 23 2022 - 04:41:58 EST


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@xxxxxxxxxxxxx>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@xxxxxxx>

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@xxxxxxxx>
SUSE Labs, CR