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

Commit 14e11e10 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

ext2: change the default behaviour on error 



ext2 file system was by default ignoring errors and continuing.  This is
not a good default as continuing on error could lead to file system
corruption.  Change the default to mark the file system readonly.  Debian
and ubuntu already does this as the default in their fstab.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: Jan Kara <jack@ucw.cz>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f0adaec

fs/ext2/super.c

+8 −8
Original line number Diff line number Diff line
@@ -234,16 +234,16 @@ static int ext2_show_options(struct seq_file *seq, struct vfsmount *vfs) 
	    le16_to_cpu(es->s_def_resgid) != EXT2_DEF_RESGID) {

		seq_printf(seq, ",resgid=%u", sbi->s_resgid);

	}

	if (test_opt(sb, ERRORS_CONT)) {

	if (test_opt(sb, ERRORS_RO)) {

		int def_errors = le16_to_cpu(es->s_errors);



		if (def_errors == EXT2_ERRORS_PANIC ||

		    def_errors == EXT2_ERRORS_RO) {

			seq_puts(seq, ",errors=continue");

		    def_errors == EXT2_ERRORS_CONTINUE) {

			seq_puts(seq, ",errors=remount-ro");

		}

	}

	if (test_opt(sb, ERRORS_RO))

		seq_puts(seq, ",errors=remount-ro");

	if (test_opt(sb, ERRORS_CONT))

		seq_puts(seq, ",errors=continue");

	if (test_opt(sb, ERRORS_PANIC))

		seq_puts(seq, ",errors=panic");

	if (test_opt(sb, NO_UID32))
@@ -820,10 +820,10 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	

	if (le16_to_cpu(sbi->s_es->s_errors) == EXT2_ERRORS_PANIC)

		set_opt(sbi->s_mount_opt, ERRORS_PANIC);

	else if (le16_to_cpu(sbi->s_es->s_errors) == EXT2_ERRORS_RO)

		set_opt(sbi->s_mount_opt, ERRORS_RO);

	else

	else if (le16_to_cpu(sbi->s_es->s_errors) == EXT2_ERRORS_CONTINUE)

		set_opt(sbi->s_mount_opt, ERRORS_CONT);

	else

		set_opt(sbi->s_mount_opt, ERRORS_RO);



	sbi->s_resuid = le16_to_cpu(es->s_def_resuid);

	sbi->s_resgid = le16_to_cpu(es->s_def_resgid);