diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-31 22:41:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-31 22:41:46 -0400 |
commit | c29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a (patch) | |
tree | 4917ad0bd8979dcae34f626032b28e62b9e358fd /net/core/sock.c | |
parent | 8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (diff) |
[SOCK][NETNS]: Add a struct net argument to sock_prot_inuse_add and _get.
This counter is about to become per-proto-and-per-net, so we'll need
two arguments to determine which cell in this "table" to work with.
All the places, but proc already pass proper net to it - proc will be
tuned a bit later.
Some indentation with spaces in proc files is done to keep the file
coding style consistent.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index c1ae56eb96ec..6f36ab91bb59 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1949,13 +1949,13 @@ struct prot_inuse { | |||
1949 | static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR); | 1949 | static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR); |
1950 | static DEFINE_PER_CPU(struct prot_inuse, prot_inuse); | 1950 | static DEFINE_PER_CPU(struct prot_inuse, prot_inuse); |
1951 | 1951 | ||
1952 | void sock_prot_inuse_add(struct proto *prot, int val) | 1952 | void sock_prot_inuse_add(struct net *net, struct proto *prot, int val) |
1953 | { | 1953 | { |
1954 | __get_cpu_var(prot_inuse).val[prot->inuse_idx] += val; | 1954 | __get_cpu_var(prot_inuse).val[prot->inuse_idx] += val; |
1955 | } | 1955 | } |
1956 | EXPORT_SYMBOL_GPL(sock_prot_inuse_add); | 1956 | EXPORT_SYMBOL_GPL(sock_prot_inuse_add); |
1957 | 1957 | ||
1958 | int sock_prot_inuse_get(struct proto *prot) | 1958 | int sock_prot_inuse_get(struct net *net, struct proto *prot) |
1959 | { | 1959 | { |
1960 | int cpu, idx = prot->inuse_idx; | 1960 | int cpu, idx = prot->inuse_idx; |
1961 | int res = 0; | 1961 | int res = 0; |