---

yaml --- r: 179409 b: refs/heads/master c: 7b43a79 h: refs/heads/master i: 179407: 4c140a9 v: v3
git-mirror · Jan 16, 2010 · 2db4744 · 2db4744
1 parent 2c9f8cf
commit 2db4744
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);