From 86937c05cb44654649a089744cd49ab0dc6873a8 Mon Sep 17 00:00:00 2001 From: Zhao Hongjiang Date: Fri, 16 Nov 2012 03:03:02 +0000 Subject: [PATCH] user_ns: get rid of duplicate code in net_ctl_permissions Get rid of duplicate code in net_ctl_permissions and fix the comment. Signed-off-by: Zhao Hongjiang Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller --- net/sysctl_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 6410436aa492..9bc6db04be3e 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -51,10 +51,10 @@ static int net_ctl_permissions(struct ctl_table_header *head, int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } - /* Allow netns root group to have the same assess as the root group */ + /* Allow netns root group to have the same access as the root group */ if (gid_eq(root_gid, current_gid())) { int mode = (table->mode >> 3) & 7; - return (mode << 3) | (mode << 3) | mode; + return (mode << 3) | mode; } return table->mode; } -- 2.20.1