diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2011-10-28 14:13:20 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@serles.lst.de> | 2011-11-02 12:53:42 +0100 |
| commit | 2833eb2b465a274d1a2529fed76c6d2904f8022b (patch) | |
| tree | ac1fedbdc0468e5e9450b4a679a0ee0dc268971f /fs/super.c | |
| parent | readlinkat: ensure we return ENOENT for the empty pathname for normal lookups (diff) | |
| download | linux-2833eb2b465a274d1a2529fed76c6d2904f8022b.tar.xz linux-2833eb2b465a274d1a2529fed76c6d2904f8022b.zip | |
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: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Toshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/super.c b/fs/super.c index 32a81f3467e0..afd0f1ad45e0 100644 --- a/fs/super.c +++ b/fs/super.c @@ -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) - return 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); |