From 81e548b691f443791db3c5a0f6daacf382b30a6f Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Fri, 1 Feb 2013 15:56:22 +0300
Subject: [PATCH] --- yaml --- r: 359742 b: refs/heads/master c:
 71a50306934f416e74ba27cbfb88855c22251525 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfsd/nfs4recover.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 319cc9c04859..67b8afb1f669 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96d851c4d28de8cc83fe2bd5c6bc2eb8f253a6c5
+refs/heads/master: 71a50306934f416e74ba27cbfb88855c22251525
diff --git a/trunk/fs/nfsd/nfs4recover.c b/trunk/fs/nfsd/nfs4recover.c
index ba6fdd4a0455..e0ae1cf18a82 100644
--- a/trunk/fs/nfsd/nfs4recover.c
+++ b/trunk/fs/nfsd/nfs4recover.c
@@ -1185,6 +1185,12 @@ bin_to_hex_dup(const unsigned char *src, int srclen)
 static int
 nfsd4_umh_cltrack_init(struct net __attribute__((unused)) *net)
 {
+	/* XXX: The usermode helper s not working in container yet. */
+	if (net != &init_net) {
+		WARN(1, KERN_ERR "NFSD: attempt to initialize umh client "
+			"tracking in a container!\n");
+		return -EINVAL;
+	}
 	return nfsd4_umh_cltrack_upcall("init", NULL, NULL);
 }