diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-02 05:11:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-02 05:11:49 +0100 |
| commit | 3a18ca061311f2f1ee9c44012f89c7436d392117 (patch) | |
| tree | 40b6222323363dd5b790f9616f5d5faa90df12f1 /fs | |
| parent | s390: fix machine check handling (diff) | |
| parent | jbd2: fix regression where we fail to initialize checksum seed when loading (diff) | |
| download | linux-3a18ca061311f2f1ee9c44012f89c7436d392117.tar.xz linux-3a18ca061311f2f1ee9c44012f89c7436d392117.zip | |
Merge tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bugfix from Ted Ts'o:
"Fix an ext4 metadata checksum regression introduced in v3.18-rc3"
* tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: fix regression where we fail to initialize checksum seed when loading
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd2/journal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index e4dc74713a43..1df94fabe4eb 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1853,13 +1853,12 @@ int jbd2_journal_set_features (journal_t *journal, unsigned long compat, journal->j_chksum_driver = NULL; return 0; } - } - /* Precompute checksum seed for all metadata */ - if (jbd2_journal_has_csum_v2or3(journal)) + /* Precompute checksum seed for all metadata */ journal->j_csum_seed = jbd2_chksum(journal, ~0, sb->s_uuid, sizeof(sb->s_uuid)); + } } /* If enabling v1 checksums, downgrade superblock */ |