diff --git a/[refs] b/[refs] index f3be8f671203..3116d469d571 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0875a2b448fcaba67010850cf9649293a5ef653d +refs/heads/master: d096ad0f79a782935d2e06ae8fb235e8c5397775 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 4969167ac267..183ae3447f64 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -4729,7 +4729,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) } ext4_setup_system_zone(sb); - if (sbi->s_journal == NULL) + if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY)) ext4_commit_super(sb, 1); #ifdef CONFIG_QUOTA