diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-09-16 11:45:24 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2020-11-02 17:09:59 -0800 |
| commit | d97f3bdf7a1c0346d3a272aa756d16633f0b8b3b (patch) | |
| tree | 543b266786797b051eddf33ec1d27a5dc39b9677 /include/net/sock.h | |
| parent | 891cd1f99dd94746f0caf5eea0121079178ee9bf (diff) | |
| download | linux-d97f3bdf7a1c0346d3a272aa756d16633f0b8b3b.tar.gz | |
net: Un-hide lockdep_sock_is_held() for !LOCKDEP
Currently, variables used only within lockdep expressions are flagged
as unused, requiring that these variables' declarations be decorated
with either #ifdef or __maybe_unused. This results in ugly code.
This commit therefore causes the lockdep_sock_is_held() function to be
visible even when lockdep is not enabled, thus removing the need for
these decorations. This approach further relies on dead-code elimination
to remove any references to functions or variables that are not available
in non-lockdep kernels.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index a5c6ae78df77d0..198d5486fb09ae 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1566,13 +1566,11 @@ do { \ lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ } while (0) -#ifdef CONFIG_LOCKDEP static inline bool lockdep_sock_is_held(const struct sock *sk) { return lockdep_is_held(&sk->sk_lock) || lockdep_is_held(&sk->sk_lock.slock); } -#endif void lock_sock_nested(struct sock *sk, int subclass); |