diff options
| author | Zhang Yi <yi.zhang@huawei.com> | 2023-08-11 14:36:01 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-08-15 09:00:33 -0400 |
| commit | 9600f3e5cfd0360b10c271149032c77917baedc5 (patch) | |
| tree | 73659efe2b27aa146c0c33af50f7c8b26dc9a671 /fs/jbd2 | |
| parent | c30713084ba5b6fa343129613ec349ea91f0c458 (diff) | |
| download | linux-9600f3e5cfd0360b10c271149032c77917baedc5.tar.gz linux-9600f3e5cfd0360b10c271149032c77917baedc5.tar.bz2 linux-9600f3e5cfd0360b10c271149032c77917baedc5.zip | |
jbd2: don't load superblock in jbd2_journal_check_used_features()
Since load_superblock() has been moved to journal_init_common(), the
in-memory superblock structure is initialized and contains valid data
once the file system has a journal_t object, so it's safe to access it,
let's drop the call to journal_get_superblock() from
jbd2_journal_check_used_features() and also drop the setting/clearing of
the veirfy bit of the superblock buffer.
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230811063610.2980059-4-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 98b43a9dcabe..95499b3184aa 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1361,8 +1361,6 @@ static int journal_get_superblock(journal_t *journal) bh = journal->j_sb_buffer; J_ASSERT(bh != NULL); - if (buffer_verified(bh)) - return 0; err = bh_read(bh, 0); if (err < 0) { @@ -1437,7 +1435,6 @@ static int journal_get_superblock(journal_t *journal) goto out; } } - set_buffer_verified(bh); return 0; out: @@ -2226,8 +2223,6 @@ int jbd2_journal_check_used_features(journal_t *journal, unsigned long compat, if (!compat && !ro && !incompat) return 1; - if (journal_get_superblock(journal)) - return 0; if (!jbd2_format_support_feature(journal)) return 0; |