From 3e50d70cd9174eb215fdbdab311cace6b4d888da Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Mon, 21 Apr 2014 18:23:37 +0400
Subject: [PATCH] mounts: mntns_collect_root in __open_mountpoint

We are going to support nested mount namespaces,
file descriptors can be from different namespaces,
so a namespace root must be updated for each of them.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 mount.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mount.c b/mount.c
index c489daae8..0b5da53f6 100644
--- a/mount.c
+++ b/mount.c
@@ -491,7 +491,9 @@ static int __open_mountpoint(struct mount_info *pm, int mnt_fd)
 	if (mnt_fd == -1) {
 		int mntns_root;
 
-		mntns_root = get_service_fd(ROOT_FD_OFF);
+		mntns_root = mntns_collect_root(pm->nsid->pid);
+		if (mntns_root < 0)
+			return -1;
 
 		mnt_fd = openat(mntns_root, pm->mountpoint, O_RDONLY);
 		if (mnt_fd < 0) {