From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 18 Dec 2009 20:18:15 +0000 (+0100)
Subject: vfs: get_sb_single() - do not pass options twice
X-Git-Tag: firefly_0821_release~11625^2~257
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4bc685e6b0d123ceca7bccb05ebce2e5e6a5ba21;p=firefly-linux-kernel-4.4.55.git

vfs: get_sb_single() - do not pass options twice

commit 9329d1beaeed1a94f030c784dcec5ff973f402c4 upstream.

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>
---

diff --git a/fs/super.c b/fs/super.c
index 19eb70b374bc..aff046b0fe78 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;
 }