Received-SPF: pass (google.com: domain of linux-kernel+bounces-25652-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Li kunyu <kunyu@nfschina.com>
To: linux-kernel@vger.kernel.org
Cc: Li kunyu <kunyu@nfschina.com>
Subject: [PATCH] utsname: Optimize clone_uts_ns()
Date: Mon, 15 Jan 2024 14:11:27 +0800
Message-Id: <20240115061127.30836-1-kunyu@nfschina.com>
Precedence: bulk

Optimize the err variable assignment location so that the err variable
is manually modified when an error occurs.

Signed-off-by: Li kunyu <kunyu@nfschina.com>
---
 kernel/utsname.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/utsname.c b/kernel/utsname.c
index b1ac3ca870f24..f55568e00927c 100644
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -49,15 +49,17 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
 	struct ucounts *ucounts;
 	int err;
 
-	err = -ENOSPC;
 	ucounts = inc_uts_namespaces(user_ns);
-	if (!ucounts)
+	if (!ucounts) {
+		err = -ENOSPC;
 		goto fail;
+	}
 
-	err = -ENOMEM;
 	ns = create_uts_ns();
-	if (!ns)
+	if (!ns) {
+		err = -ENOMEM;
 		goto fail_dec;
+	}
 
 	err = ns_alloc_inum(&ns->ns);
 	if (err)
-- 
2.18.2