diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2008-01-03 23:46:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:00:36 -0500 |
commit | 65f7651788e18fadb2fbb7276af935d7871e1803 (patch) | |
tree | dcad32d4344d6d11d80061773d9d1dbc9ae92223 /net/ipv4/inet_hashtables.c | |
parent | 571e7682026fd0e25833d103a3eeb74be29bf199 (diff) |
[NET]: prot_inuse cleanups and optimizations
1) Cleanups (all functions are prefixed by sock_prot_inuse)
sock_prot_inc_use(prot) -> sock_prot_inuse_add(prot,-1)
sock_prot_dec_use(prot) -> sock_prot_inuse_add(prot,-1)
sock_prot_inuse() -> sock_prot_inuse_get()
New functions :
sock_prot_inuse_init() and sock_prot_inuse_free() to abstract pcounter use.
2) if CONFIG_PROC_FS=n, we can zap 'inuse' member from "struct proto",
since nobody wants to read the inuse value.
This saves 1372 bytes on i386/SMP and some cpu cycles.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
-rw-r--r-- | net/ipv4/inet_hashtables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 88a059e04e30..619c63c6948a 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
@@ -278,7 +278,7 @@ unique: | |||
278 | sk->sk_hash = hash; | 278 | sk->sk_hash = hash; |
279 | BUG_TRAP(sk_unhashed(sk)); | 279 | BUG_TRAP(sk_unhashed(sk)); |
280 | __sk_add_node(sk, &head->chain); | 280 | __sk_add_node(sk, &head->chain); |
281 | sock_prot_inc_use(sk->sk_prot); | 281 | sock_prot_inuse_add(sk->sk_prot, 1); |
282 | write_unlock(lock); | 282 | write_unlock(lock); |
283 | 283 | ||
284 | if (twp) { | 284 | if (twp) { |
@@ -321,7 +321,7 @@ void __inet_hash_nolisten(struct inet_hashinfo *hashinfo, struct sock *sk) | |||
321 | 321 | ||
322 | write_lock(lock); | 322 | write_lock(lock); |
323 | __sk_add_node(sk, list); | 323 | __sk_add_node(sk, list); |
324 | sock_prot_inc_use(sk->sk_prot); | 324 | sock_prot_inuse_add(sk->sk_prot, 1); |
325 | write_unlock(lock); | 325 | write_unlock(lock); |
326 | } | 326 | } |
327 | EXPORT_SYMBOL_GPL(__inet_hash_nolisten); | 327 | EXPORT_SYMBOL_GPL(__inet_hash_nolisten); |
@@ -342,7 +342,7 @@ void __inet_hash(struct inet_hashinfo *hashinfo, struct sock *sk) | |||
342 | 342 | ||
343 | inet_listen_wlock(hashinfo); | 343 | inet_listen_wlock(hashinfo); |
344 | __sk_add_node(sk, list); | 344 | __sk_add_node(sk, list); |
345 | sock_prot_inc_use(sk->sk_prot); | 345 | sock_prot_inuse_add(sk->sk_prot, 1); |
346 | write_unlock(lock); | 346 | write_unlock(lock); |
347 | wake_up(&hashinfo->lhash_wait); | 347 | wake_up(&hashinfo->lhash_wait); |
348 | } | 348 | } |