aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-01 20:11:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-01 20:11:49 -0800
commit3a18ca061311f2f1ee9c44012f89c7436d392117 (patch)
tree40b6222323363dd5b790f9616f5d5faa90df12f1
parent2cb4a18262fd0108cb8abd875710c59d0aa66f1d (diff)
parent32f3869184d498850d36b7e6aa3b9f5260ea648a (diff)
downloadlinux-linaro-stable-3a18ca061311f2f1ee9c44012f89c7436d392117.tar.gz
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
-rw-r--r--fs/jbd2/journal.c5
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 */