On Fri 10-03-23 20:52:06, Zhihao Cheng wrote:
> From: Zhang Yi <yi.zhang@xxxxxxxxxx>
>
> journal->j_format_version is no longer used, remove it.
>
> Signed-off-by: Zhang Yi <yi.zhang@xxxxxxxxxx>
> Signed-off-by: Zhihao Cheng <chengzhihao1@xxxxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/jbd2/journal.c | 9 ---------
> include/linux/jbd2.h | 5 -----
> 2 files changed, 14 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index cd94d068b4e6..fbada835b6b7 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -1997,15 +1997,6 @@ static int load_superblock(journal_t *journal)
>
> sb = journal->j_superblock;
>
> - switch (be32_to_cpu(sb->s_header.h_blocktype)) {
> - case JBD2_SUPERBLOCK_V1:
> - journal->j_format_version = 1;
> - break;
> - case JBD2_SUPERBLOCK_V2:
> - journal->j_format_version = 2;
> - break;
> - }
> -
> journal->j_tail_sequence = be32_to_cpu(sb->s_sequence);
> journal->j_tail = be32_to_cpu(sb->s_start);
> journal->j_first = be32_to_cpu(sb->s_first);
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index 7095c0f17ad0..b7c79f68f7ca 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -792,11 +792,6 @@ struct journal_s
> */
> journal_superblock_t *j_superblock;
>
> - /**
> - * @j_format_version: Version of the superblock format.
> - */
> - int j_format_version;
> -
> /**
> * @j_state_lock: Protect the various scalars in the journal.
> */
> --
> 2.31.1
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
