summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-12-18 21:18:15 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-23 11:23:43 -0800
commit9329d1beaeed1a94f030c784dcec5ff973f402c4 (patch)
treecbb0bc9153f6fc98db6156779c0265f7859bbec3
parentf1f76f865b5f66db5b5c7f2d19874f2bb9b43b8d (diff)
downloadop-kernel-dev-9329d1beaeed1a94f030c784dcec5ff973f402c4.zip
op-kernel-dev-9329d1beaeed1a94f030c784dcec5ff973f402c4.tar.gz
vfs: get_sb_single() - do not pass options twice
Filesystem code usually destroys the option buffer while parsing it. This leads to errors when the same buffer is passed twice. In case we fill a new superblock do not call remount. This is needed to quite a warning that the debugfs code causes every boot. Cc: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c
index 19eb70b..aff046b 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -901,8 +901,9 @@ int get_sb_single(struct file_system_type *fs_type,
return error;
}
s->s_flags |= MS_ACTIVE;
+ } else {
+ do_remount_sb(s, flags, data, 0);
}
- do_remount_sb(s, flags, data, 0);
simple_set_mnt(mnt, s);
return 0;
}
OpenPOWER on IntegriCloud