From: Zhihao Cheng <chengzhihao1@huawei.com>
To: <tytso@mit.edu>, <adilger.kernel@dilger.ca>, <jack@suse.com>,
<tudor.ambarus@linaro.org>
Cc: <linux-ext4@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<chengzhihao1@huawei.com>, <yi.zhang@huawei.com>
Subject: [PATCH v3 6/6] jbd2: remove j_format_version
Date: Wed, 15 Mar 2023 09:31:28 +0800 [thread overview]
Message-ID: <20230315013128.3911115-7-chengzhihao1@huawei.com> (raw)
In-Reply-To: <20230315013128.3911115-1-chengzhihao1@huawei.com>
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>
Reviewed-by: Jan Kara <jack@suse.cz>
---
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 ee678f9e40c4..837a9a85e585 100644
--- 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 1ffcea5c024e..6990fc891612 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
next prev parent reply other threads:[~2023-03-15 1:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 1:31 [PATCH v3 0/6] ext4: Fix stale buffer loading from last failed Zhihao Cheng
2023-03-15 1:31 ` [PATCH v3 1/6] ext4: Fix reusing stale buffer heads from last failed mounting Zhihao Cheng
2023-03-15 8:43 ` Jan Kara
2023-03-15 1:31 ` [PATCH v3 2/6] ext4: ext4_put_super: Remove redundant checking for 'sbi->s_journal_bdev' Zhihao Cheng
2023-03-15 8:44 ` Jan Kara
2023-03-15 1:31 ` [PATCH v3 3/6] jbd2: remove unused feature macros Zhihao Cheng
2023-03-15 1:31 ` [PATCH v3 4/6] jbd2: switch to check format version in superblock directly Zhihao Cheng
2023-03-15 1:31 ` [PATCH v3 5/6] jbd2: factor out journal initialization from journal_get_superblock() Zhihao Cheng
2023-03-15 1:31 ` Zhihao Cheng [this message]
2023-06-09 8:04 ` [PATCH v3 0/6] ext4: Fix stale buffer loading from last failed Zhihao Cheng
2023-06-11 4:42 ` Theodore Ts'o
2023-06-12 1:38 ` Zhihao Cheng
2023-06-15 14:59 ` Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230315013128.3911115-7-chengzhihao1@huawei.com \
--to=chengzhihao1@huawei.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tudor.ambarus@linaro.org \
--cc=tytso@mit.edu \
--cc=yi.zhang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.