lkml.org 
[lkml]   [2023]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/5] jbd2: remove j_format_version
    Date
    From: Zhang Yi <yi.zhang@huawei.com>

    journal->j_format_version is no longer used, remove it.

    Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
    Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
    ---
    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 f99c46d880b2..c19cdd402a5f 100644
    --- a/fs/jbd2/journal.c
    +++ b/fs/jbd2/journal.c
    @@ -2003,15 +2003,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
    \
     
     \ /
      Last update: 2023-03-27 00:56    [W:4.038 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site