From 6f2e4b9615d5bde95b54e93ae13bb26819c6b5d2 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@openvz.org>
Date: Fri, 26 Jan 2007 00:56:53 -0800
Subject: [PATCH] --- yaml --- r: 45830 b: refs/heads/master c:
 863c47028eb469c9e6c4e4287b01bea2bbf78766 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index eb270188d82b..6b1b4c2b8a88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c633090e3105e779c97d4978e5e3d7d66b291cfb
+refs/heads/master: 863c47028eb469c9e6c4e4287b01bea2bbf78766
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 77a57b5799c4..ff7a66850602 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -371,9 +371,11 @@ static int mounts_open(struct inode *inode, struct file *file)
 
 	if (task) {
 		task_lock(task);
-		ns = task->nsproxy->mnt_ns;
-		if (ns)
-			get_mnt_ns(ns);
+		if (task->nsproxy) {
+			ns = task->nsproxy->mnt_ns;
+			if (ns)
+				get_mnt_ns(ns);
+		}
 		task_unlock(task);
 		put_task_struct(task);
 	}