Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a18ca06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2cb4a182 32f38691

fs/jbd2/journal.c

+2 −3
Original line number Diff line number Diff line
@@ -1853,14 +1853,13 @@ 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))

			journal->j_csum_seed = jbd2_chksum(journal, ~0,

							   sb->s_uuid,

							   sizeof(sb->s_uuid));

		}

	}



	/* If enabling v1 checksums, downgrade superblock */

	if (COMPAT_FEATURE_ON(JBD2_FEATURE_COMPAT_CHECKSUM))