| From | Luis Henriques <> | Subject | [PATCH 3.16.y-ckt 159/170] ext4: enable journal checksum when metadata checksum feature enabled | Date | Tue, 11 Nov 2014 11:08:38 +0000 |
| |
3.16.7-ckt1 -stable review patch. If anyone has any objections, please let me know.
------------------
From: "Darrick J. Wong" <darrick.wong@oracle.com>
commit 98c1a7593fa355fda7f5a5940c8bf5326ca964ba upstream.
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 <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- fs/ext4/super.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a6c188bb5265..447ccd4af707 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3502,6 +3502,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) -- 2.1.0
|