From 90124865e86ead7417d3196416d8415a892e2635 Mon Sep 17 00:00:00 2001
From: Zhao Hongjiang <zhaohongjiang@huawei.com>
Date: Thu, 13 Sep 2012 16:38:03 +0800
Subject: [PATCH] --- yaml --- r: 346320 b: refs/heads/master c:
 ae11e0f18482bfe0cd83b9b61434ea7e0bd94e25 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/namespace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bf31243394cf..c3b87acfe134 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c55cfc4166d9a0f38de779bd4d75a90afbe7734
+refs/heads/master: ae11e0f18482bfe0cd83b9b61434ea7e0bd94e25
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
index 9ddc86f93221..cab78a74aca3 100644
--- a/trunk/fs/namespace.c
+++ b/trunk/fs/namespace.c
@@ -2775,7 +2775,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
 
 	if (!ns_capable(mnt_ns->user_ns, CAP_SYS_ADMIN) ||
 	    !nsown_capable(CAP_SYS_CHROOT))
-		return -EINVAL;
+		return -EPERM;
 
 	if (fs->users != 1)
 		return -EINVAL;