diff options
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index a6ba1f8871fd..5a0a58ac4126 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -246,6 +246,7 @@ struct cg_proto; | |||
246 | * @sk_user_data: RPC layer private data | 246 | * @sk_user_data: RPC layer private data |
247 | * @sk_sndmsg_page: cached page for sendmsg | 247 | * @sk_sndmsg_page: cached page for sendmsg |
248 | * @sk_sndmsg_off: cached offset for sendmsg | 248 | * @sk_sndmsg_off: cached offset for sendmsg |
249 | * @sk_peek_off: current peek_offset value | ||
249 | * @sk_send_head: front of stuff to transmit | 250 | * @sk_send_head: front of stuff to transmit |
250 | * @sk_security: used by security modules | 251 | * @sk_security: used by security modules |
251 | * @sk_mark: generic packet mark | 252 | * @sk_mark: generic packet mark |
@@ -1128,9 +1129,9 @@ sk_sockets_allocated_read_positive(struct sock *sk) | |||
1128 | struct proto *prot = sk->sk_prot; | 1129 | struct proto *prot = sk->sk_prot; |
1129 | 1130 | ||
1130 | if (mem_cgroup_sockets_enabled && sk->sk_cgrp) | 1131 | if (mem_cgroup_sockets_enabled && sk->sk_cgrp) |
1131 | return percpu_counter_sum_positive(sk->sk_cgrp->sockets_allocated); | 1132 | return percpu_counter_read_positive(sk->sk_cgrp->sockets_allocated); |
1132 | 1133 | ||
1133 | return percpu_counter_sum_positive(prot->sockets_allocated); | 1134 | return percpu_counter_read_positive(prot->sockets_allocated); |
1134 | } | 1135 | } |
1135 | 1136 | ||
1136 | static inline int | 1137 | static inline int |