From: Darrick J. Wong Date: Thu, 30 Oct 2014 14:53:16 +0000 (-0400) Subject: ext4: enable journal checksum when metadata checksum feature enabled X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98c1a7593fa355fda7f5a5940c8bf5326ca964ba;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git ext4: enable journal checksum when metadata checksum feature enabled If metadata checksumming is turned on for the FS, we need to tell the journal to use checksumming too. Signed-off-by: Darrick J. Wong Signed-off-by: Theodore Ts'o Cc: stable@vger.kernel.org --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 1eda6ab0ef9d..5c11e2153e36 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3526,6 +3526,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) #ifdef CONFIG_EXT4_FS_POSIX_ACL set_opt(sb, POSIX_ACL); #endif + /* don't forget to enable journal_csum when metadata_csum is enabled. */ + if (ext4_has_metadata_csum(sb)) + set_opt(sb, JOURNAL_CHECKSUM); + if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA) set_opt(sb, JOURNAL_DATA); else if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_ORDERED)