Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1242348

[PATCH 3/9] net/nfnetlink: lockdep_nfnl_is_held can be boolean

Show all headers | View raw

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 <bywxiaobai@163.com>
---
 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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] net: small improvement Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
  [PATCH 5/9] net/dccp: dccp_list_has_service can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
  [PATCH 3/9] net/nfnetlink: lockdep_nfnl_is_held can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
  [PATCH 7/9] net/inetdevice: inet_ifa_match can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
  [PATCH 1/9] net/netlink: lockdep_genl_is_held can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
  [PATCH 4/9] net/can: can_dropped_invalid_skb can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
    Re: [PATCH 4/9] net/can: can_dropped_invalid_skb can be boolean Marc Kleine-Budde <mkl@pengutronix.de> - 2015-10-09 12:20 +0200
      Re: [PATCH 4/9] net/can: can_dropped_invalid_skb can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-09 16:30 +0200
        Re: [PATCH 4/9] net/can: can_dropped_invalid_skb can be boolean Marc Kleine-Budde <mkl@pengutronix.de> - 2015-10-12 11:10 +0200
  [PATCH 2/9] net/ieee80211: ieee80211_is_* can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:40 +0200
  [PATCH 6/9] net/dccp: dccp_bad_service_code can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:50 +0200
  [PATCH 8/9] net/inetdevice: bad_mask can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:50 +0200
  [PATCH 9/9] net/core: lockdep_rtnl_is_held can be boolean Yaowei Bai <bywxiaobai@163.com> - 2015-10-08 15:50 +0200
  Re: [PATCH 0/9] net: small improvement David Miller <davem@davemloft.net> - 2015-10-09 16:40 +0200

csiph-web