From 0db82cca524b4a3cdd89be0e26037b441ae8244b Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 28 Apr 2012 23:21:56 +0000 Subject: [PATCH] --- yaml --- r: 299961 b: refs/heads/master c: 518fbf9cdf17875d808596afd77fc115a6f942ca h: refs/heads/master i: 299959: 19d51789f6fb42e9b16b26dbcfc0c2e028a519c7 v: v3 --- [refs] | 2 +- trunk/include/net/sock.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9ef9e67ebd3..2d6d770cafca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5414fc12e32a0e0833ec61ba8be864c46cd19966 +refs/heads/master: 518fbf9cdf17875d808596afd77fc115a6f942ca diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 188532ee88b6..5a0a58ac4126 100644 --- a/trunk/include/net/sock.h +++ b/trunk/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