Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Jing Xiangfeng <jingxiangfeng@huawei.com>
To:     <christian.brauner@ubuntu.com>, <serge@hallyn.com>
CC:     <linux-kernel@vger.kernel.org>, <jingxiangfeng@huawei.com>
Subject: [PATCH] userns: Remove redundant assignment to variable ret
Date:   Mon, 21 Sep 2020 14:37:54 +0800
Message-ID: <20200921063754.179899-1-jingxiangfeng@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type:   text/plain; charset=US-ASCII
Precedence: bulk

After commit d2f007dbe7e4 ("userns: also map extents in the reverse map
to kernel IDs"), the assignment to ret is redundant. So remove it.

Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
---
 kernel/user_namespace.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 87804e0371fe..0157ae92e447 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -968,7 +968,6 @@ static ssize_t map_write(struct file *file, const char __user *buf,
 	if (!new_idmap_permitted(file, ns, cap_setid, &new_map))
 		goto out;
 
-	ret = -EPERM;
 	/* Map the lower ids from the parent user namespace to the
 	 * kernel global id space.
 	 */
-- 
2.17.1