lkml.org 
[lkml]   [2015]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/9] net/nfnetlink: lockdep_nfnl_is_held can be boolean
    Date
    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



    \
     
     \ /
      Last update: 2015-10-08 16:01    [W:3.709 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site