diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-28 12:13:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-28 12:13:02 -0800 |
| commit | 9a834f9b04bc5ed2db27eb45b0cc6415ce7c314c (patch) | |
| tree | 9d8b2dd6c404c843212078fb52a8f38b75214afc /include/net/af_unix.h | |
| parent | e955376277839db92774ec24d559ab42442b95fc (diff) | |
| parent | e427cad6eee47e2daf207cd7a4156ae72496ee07 (diff) | |
Merge branch 'net-cleanup-datagram-receive-helpers'
Paolo Abeni says:
====================
net: cleanup datagram receive helpers
Several receive helpers have an optional destructor argument, which uglify
the code a bit and is taxed by retpoline overhead.
This series refactor the code so that we can drop such optional argument,
cleaning the helpers a bit and avoiding an indirect call in fast path.
The first patch refactor a bit the caller, so that the second patch
actually dropping the argument is more straight-forward
v1 -> v2:
- call scm_stat_del() only when not peeking - Kirill
- fix build issue with CONFIG_INET_ESPINTCP
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index e51d727cc3cd..f42fdddecd41 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -42,7 +42,7 @@ struct unix_skb_parms { } __randomize_layout; struct scm_stat { - u32 nr_fds; + atomic_t nr_fds; }; #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb)) |
