From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932993Ab0JEKcM (ORCPT ); Tue, 5 Oct 2010 06:32:12 -0400 Received: from fxip-0047f.externet.hu ([88.209.222.127]:56720 "EHLO pomaz-ex.szeredi.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932972Ab0JEKcJ (ORCPT ); Tue, 5 Oct 2010 06:32:09 -0400 Message-Id: <20101005103135.841553506@szeredi.hu> References: <20101005103108.288743609@szeredi.hu> User-Agent: quilt/0.46-1 Date: Tue, 05 Oct 2010 12:31:10 +0200 From: Miklos Szeredi To: viro@zeniv.linux.org.uk Cc: dave@linux.vnet.ibm.com, akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] vfs: ignore error on forced remount Content-Disposition: inline; filename=vfs-fix-force-remount-readonly.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miklos Szeredi On emergency remount we want to force MS_RDONLY on the super block even if ->remount_fs() failed for some reason. Signed-off-by: Miklos Szeredi --- fs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6/fs/super.c =================================================================== --- linux-2.6.orig/fs/super.c 2010-10-01 20:40:42.000000000 +0200 +++ linux-2.6/fs/super.c 2010-10-01 21:55:01.000000000 +0200 @@ -579,7 +579,8 @@ int do_remount_sb(struct super_block *sb if (sb->s_op->remount_fs) { retval = sb->s_op->remount_fs(sb, &flags, data); - if (retval) + /* If forced remount, go ahead despite any errors */ + if (retval && !force) return retval; } sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK); --