From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757738AbbJHNh7 (ORCPT ); Thu, 8 Oct 2015 09:37:59 -0400 Received: from m12-14.163.com ([220.181.12.14]:35983 "EHLO m12-14.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757712AbbJHNh4 (ORCPT ); Thu, 8 Oct 2015 09:37:56 -0400 From: Yaowei Bai To: davem@davemloft.net, tgraf@suug.ch, herbert@gondor.apana.org.au, johannes.berg@intel.com, daniel@iogearbox.net, gerrit@erg.abdn.ac.uk, socketcan@hartkopp.net, mkl@pengutronix.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/9] net/nfnetlink: lockdep_nfnl_is_held can be boolean Date: Thu, 8 Oct 2015 21:28:56 +0800 Message-Id: <1444310942-4428-4-git-send-email-bywxiaobai@163.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444310942-4428-1-git-send-email-bywxiaobai@163.com> References: <1444310942-4428-1-git-send-email-bywxiaobai@163.com> X-CM-TRANSID: DsCowEBZGkYYcBZWXEK8Dg--.7457S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ww17Xr15ZF4kKFy8tr45Awb_yoW8Xw4UpF WUKwn7Gr4xua4jgF1kC3yxAF1avF1kXry2gryYya4kAF1rWrsxt3ZYgFZ5Wa47Zrs2kF43 JFy2gw45Ars8urJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b5Ap5UUUUU= X-Originating-IP: [58.208.67.211] X-CM-SenderInfo: xe1z5x5dretxi6rwjhhfrp/1tbisB6NT1UL3hBhnwAAsC Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch makes lockdep_nfnl_is_held return bool to improve readability due to this particular function only using either one or zero as its return value. No functional change. Signed-off-by: Yaowei Bai --- include/linux/netfilter/nfnetlink.h | 6 +++--- net/netfilter/nfnetlink.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h index e955d47..249d1bb 100644 --- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -45,11 +45,11 @@ int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid, void nfnl_lock(__u8 subsys_id); void nfnl_unlock(__u8 subsys_id); #ifdef CONFIG_PROVE_LOCKING -int lockdep_nfnl_is_held(__u8 subsys_id); +bool lockdep_nfnl_is_held(__u8 subsys_id); #else -static inline int lockdep_nfnl_is_held(__u8 subsys_id) +static inline bool lockdep_nfnl_is_held(__u8 subsys_id) { - return 1; + return true; } #endif /* CONFIG_PROVE_LOCKING */ diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 70277b1..f1d9e88 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -64,7 +64,7 @@ void nfnl_unlock(__u8 subsys_id) EXPORT_SYMBOL_GPL(nfnl_unlock); #ifdef CONFIG_PROVE_LOCKING -int lockdep_nfnl_is_held(u8 subsys_id) +bool lockdep_nfnl_is_held(u8 subsys_id) { return lockdep_is_held(&table[subsys_id].mutex); } -- 1.9.1