From 789c826d8f253711ac646df5221700ba5c7b143f Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Mon, 26 Dec 2011 15:38:56 +0300
Subject: [PATCH] --- yaml --- r: 294358 b: refs/heads/master c:
 38b0da7522c086f1dcdeda39a2d1849c6a31f518 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/sunrpc/rpc_pipe.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1f44cbf3537b..ccb0727496f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bff0386305461021bbef2d958fa0f0151f56a6f
+refs/heads/master: 38b0da7522c086f1dcdeda39a2d1849c6a31f518
diff --git a/trunk/net/sunrpc/rpc_pipe.c b/trunk/net/sunrpc/rpc_pipe.c
index 8e3397fc0a7d..e32e6b8c006d 100644
--- a/trunk/net/sunrpc/rpc_pipe.c
+++ b/trunk/net/sunrpc/rpc_pipe.c
@@ -993,6 +993,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct inode *inode;
 	struct dentry *root;
+	struct net *net = data;
 
 	sb->s_blocksize = PAGE_CACHE_SIZE;
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -1017,7 +1018,7 @@ static struct dentry *
 rpc_mount(struct file_system_type *fs_type,
 		int flags, const char *dev_name, void *data)
 {
-	return mount_single(fs_type, flags, data, rpc_fill_super);
+	return mount_ns(fs_type, flags, current->nsproxy->net_ns, rpc_fill_super);
 }
 
 static struct file_system_type rpc_pipe_fs_type = {