From: Andrew Morton <akpm@osdl.org>

Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/nsproxy.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff -puN kernel/nsproxy.c~introduce-and-use-get_task_mnt_ns-tweaks kernel/nsproxy.c
--- a/kernel/nsproxy.c~introduce-and-use-get_task_mnt_ns-tweaks
+++ a/kernel/nsproxy.c
@@ -162,15 +162,16 @@ void free_nsproxy(struct nsproxy *ns)
 	kfree(ns);
 }
 
-struct mnt_namespace * get_task_mnt_ns(struct task_struct *tsk)
+struct mnt_namespace *get_task_mnt_ns(struct task_struct *tsk)
 {
 	struct mnt_namespace *mnt_ns = NULL;
 
 	task_lock(tsk);
-	if (tsk->nsproxy)
+	if (tsk->nsproxy) {
 		mnt_ns = tsk->nsproxy->mnt_ns;
-	if (mnt_ns)
-		get_mnt_ns(mnt_ns);
+		if (mnt_ns)
+			get_mnt_ns(mnt_ns);
+	}
 	task_unlock(tsk);
 
 	return mnt_ns;
_