From 2db47440e94fd35cf1913c985cc59d521fcfcfd1 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 16 Jan 2010 13:01:26 -0500
Subject: [PATCH] --- yaml --- r: 179409 b: refs/heads/master c:
 7b43a79f32c0a05e7562043af98e25c05c89b18e h: refs/heads/master i:   179407:
 4c140a9cf43ee8a70b5bf407507d9f7be6bdcb29 v: v3

---
 [refs]               | 2 +-
 trunk/fs/namespace.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 60a3abce3c0b..1569a54221bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1a1ad29739f032f8905310796e558589403d61
+refs/heads/master: 7b43a79f32c0a05e7562043af98e25c05c89b18e
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
index 4de493ea67cf..779293e29b85 100644
--- a/trunk/fs/namespace.c
+++ b/trunk/fs/namespace.c
@@ -1536,8 +1536,12 @@ static int do_remount(struct path *path, int flags, int mnt_flags,
 		err = change_mount_flags(path->mnt, flags);
 	else
 		err = do_remount_sb(sb, flags, data, 0);
-	if (!err)
+	if (!err) {
+		spin_lock(&vfsmount_lock);
+		mnt_flags |= path->mnt->mnt_flags & MNT_PNODE_MASK;
 		path->mnt->mnt_flags = mnt_flags;
+		spin_unlock(&vfsmount_lock);
+	}
 	up_write(&sb->s_umount);
 	if (!err) {
 		security_sb_post_remount(path->mnt, flags, data);