Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cbf3343 authored by Yaowei Bai's avatar Yaowei Bai Committed by David S. Miller
Browse files

net/core: lockdep_rtnl_is_held can be boolean 



This patch makes lockdep_rtnl_is_held return bool due to this
particular function only using either one or zero as its return
value.

In another patch lockdep_is_held is also made return bool.

No functional change.

Signed-off-by: default avatarYaowei Bai <bywxiaobai@163.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f06cc7b2

include/linux/rtnetlink.h

+3 −3
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ extern wait_queue_head_t netdev_unregistering_wq; 
extern struct mutex net_mutex;



#ifdef CONFIG_PROVE_LOCKING

extern int lockdep_rtnl_is_held(void);

extern bool lockdep_rtnl_is_held(void);

#else

static inline int lockdep_rtnl_is_held(void)

static inline bool lockdep_rtnl_is_held(void)

{

	return 1;

	return true;

}

#endif /* #ifdef CONFIG_PROVE_LOCKING */

net/core/rtnetlink.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int rtnl_is_locked(void) 
EXPORT_SYMBOL(rtnl_is_locked);



#ifdef CONFIG_PROVE_LOCKING

int lockdep_rtnl_is_held(void)

bool lockdep_rtnl_is_held(void)

{

	return lockdep_is_held(&rtnl_mutex);

}