diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 16:12:39 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 16:12:39 +0200 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /include/net/sock.h | |
| parent | NFSv4.1 resend LAYOUTGET on data server invalid layout errors (diff) | |
| parent | sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot (diff) | |
| download | linux-b3f87b98aa3dc22cc58f970140113b270015cddb.tar.xz linux-b3f87b98aa3dc22cc58f970140113b270015cddb.zip | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 188532ee88b6..5a0a58ac4126 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1129,9 +1129,9 @@ sk_sockets_allocated_read_positive(struct sock *sk) struct proto *prot = sk->sk_prot; if (mem_cgroup_sockets_enabled && sk->sk_cgrp) - return percpu_counter_sum_positive(sk->sk_cgrp->sockets_allocated); + return percpu_counter_read_positive(sk->sk_cgrp->sockets_allocated); - return percpu_counter_sum_positive(prot->sockets_allocated); + return percpu_counter_read_positive(prot->sockets_allocated); } static inline int |