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

Commit 2833eb2b authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Christoph Hellwig
Browse files

vfs: ignore error on forced remount 



On emergency remount we want to force MS_RDONLY on the super block
even if ->remount_fs() failed for some reason.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Tested-by: default avatarToshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1fa1e7f6

fs/super.c

+7 −2
Original line number Diff line number Diff line
@@ -727,8 +727,13 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force) 


	if (sb->s_op->remount_fs) {

		retval = sb->s_op->remount_fs(sb, &flags, data);

		if (retval)

		if (retval) {

			if (!force)

				return retval;

			/* If forced remount, go ahead despite any errors */

			WARN(1, "forced remount of a %s fs returned %i\n",

			     sb->s_type->name, retval);

		}

	}

	sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);