diff --git a/[refs] b/[refs] index 7fdce468ff25..9eef9a9ec15a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70bbb3e0a07c1ff2dd383761b12f865b6002a7a0 +refs/heads/master: ceea16bf85fb46035dda1db263ca29b0e07e22ba diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 6cf1f185b9c1..1fa3bdc3c671 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -1526,6 +1526,8 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) set_opt(sbi->s_mount_opt, ERRORS_PANIC); else if (le16_to_cpu(sbi->s_es->s_errors) == EXT4_ERRORS_RO) set_opt(sbi->s_mount_opt, ERRORS_RO); + else + set_opt(sbi->s_mount_opt, ERRORS_CONT); sbi->s_resuid = le16_to_cpu(es->s_def_resuid); sbi->s_resgid = le16_to_cpu(es->s_def_resgid);