jbd2: remove j_format_version

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>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230315013128.3911115-7-chengzhihao1@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index ee678f9..837a9a8 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2006,15 +2006,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 1ffcea5..6990fc8 100644 (file)
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -793,11 +793,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.
         */
        rwlock_t                j_state_lock;