From patchwork Tue Feb 27 22:43:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 10246285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95E8660362 for ; Tue, 27 Feb 2018 22:50:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8726528AF4 for ; Tue, 27 Feb 2018 22:50:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B20028B06; Tue, 27 Feb 2018 22:50:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2028328B06 for ; Tue, 27 Feb 2018 22:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751964AbeB0WuD (ORCPT ); Tue, 27 Feb 2018 17:50:03 -0500 Received: from hs01.dk-develop.de ([213.136.71.231]:41808 "EHLO hs01.dk-develop.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbeB0WuC (ORCPT ); Tue, 27 Feb 2018 17:50:02 -0500 Received: from danilo-linux.fritz.box (unknown [188.193.63.218]) by hs01.dk-develop.de (Postfix) with ESMTPSA id AD0381320F59; Tue, 27 Feb 2018 23:44:05 +0100 (CET) From: Danilo Krummrich To: mcgrof@kernel.org, keescook@chromium.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Danilo Krummrich Subject: [PATCH 2/2] fs/sysctl: remove redundant link check in proc_sys_link_fill_cache() Date: Tue, 27 Feb 2018 23:43:58 +0100 Message-Id: <20180227224358.12672-2-danilokrummrich@dk-develop.de> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180227224358.12672-1-danilokrummrich@dk-develop.de> References: <20180227224358.12672-1-danilokrummrich@dk-develop.de> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP proc_sys_link_fill_cache() does not need to check whether we're called for a link - it's already done by scan(). Signed-off-by: Danilo Krummrich --- fs/proc/proc_sysctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index a0b6c647835e..7e7d9facb842 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -707,17 +707,16 @@ static bool proc_sys_link_fill_cache(struct file *file, struct ctl_table *table) { bool ret = true; + int err = 0; head = sysctl_head_grab(head); if (IS_ERR(head)) return false; - if (S_ISLNK(table->mode)) { - /* It is not an error if we can not follow the link ignore it */ - int err = sysctl_follow_link(&head, &table); - if (err) - goto out; - } + /* It is not an error if we can not follow the link ignore it */ + sysctl_follow_link(&head, &table); + if (err) + goto out; ret = proc_sys_fill_cache(file, ctx, head, table); out: