Received-SPF: pass (google.com: domain of linux-kernel+bounces-25618-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Li kunyu <kunyu@nfschina.com>
To: mcgrof@kernel.org,
	keescook@chromium.org,
	yzaikin@google.com
Cc: linux-kernel@vger.kernel.org,
	linux-fsdevel@vger.kernel.org,
	Li kunyu <kunyu@nfschina.com>
Subject: [PATCH] proc: proc_sysctl: Optimize insert_links()
Date: Mon, 15 Jan 2024 12:42:00 +0800
Message-Id: <20240115044200.27922-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>
---
 fs/proc/proc_sysctl.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index cdda684551599..737071754a6e5 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -1258,13 +1258,14 @@ static int insert_links(struct ctl_table_header *head)
 	links = new_links(core_parent, head);
 
 	spin_lock(&sysctl_lock);
-	err = -ENOMEM;
-	if (!links)
+	if (!links) {
+		err = -ENOMEM;
 		goto out;
+	}
 
-	err = 0;
 	if (get_links(core_parent, head, head->root)) {
 		kfree(links);
+		err = 0;
 		goto out;
 	}
 
-- 
2.18.2