diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-07 23:44:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-07 23:44:15 +0300 |
| commit | 1fbbe1a8a9b195c4ac856540dfaef49d663c2e91 (patch) | |
| tree | 24f93b5ab435e0bd4cada95b9f91df0a2e205186 /include/linux | |
| parent | 8501786929de4616b10b8059ad97abd304a7dddf (diff) | |
| parent | 8ced425ee630c03beea06c1dfa35190bf8395d07 (diff) | |
| download | linux-1fbbe1a8a9b195c4ac856540dfaef49d663c2e91.tar.xz | |
Merge branch 'sock-lockdep-tightening'
Hannes Frederic Sowa says:
====================
sock: lockdep tightening
First patch is from Eric Dumazet and improves lockdep accuracy for
socket locks. After that, second patch introduces lockdep_sock_is_held
and uses it. Final patch reverts and reworks the lockdep fix from Daniel
in the filter code, as we now have tighter lockdep support.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/filter.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index a51a5361695f..43aa1f8855c7 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -465,14 +465,10 @@ int bpf_prog_create_from_user(struct bpf_prog **pfp, struct sock_fprog *fprog, void bpf_prog_destroy(struct bpf_prog *fp); int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk); -int __sk_attach_filter(struct sock_fprog *fprog, struct sock *sk, - bool locked); int sk_attach_bpf(u32 ufd, struct sock *sk); int sk_reuseport_attach_filter(struct sock_fprog *fprog, struct sock *sk); int sk_reuseport_attach_bpf(u32 ufd, struct sock *sk); int sk_detach_filter(struct sock *sk); -int __sk_detach_filter(struct sock *sk, bool locked); - int sk_get_filter(struct sock *sk, struct sock_filter __user *filter, unsigned int len); |