[NET]: fix __sk_stream_mem_reclaim

__sk_stream_mem_reclaim is only called by sk_stream_mem_reclaim.

As such the check on sk->sk_forward_alloc is not needed and can be
removed.

Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ian McDonald 2006-07-12 17:58:53 -07:00 committed by David S. Miller
parent fd1278d720
commit a6f157a88d
1 changed files with 7 additions and 9 deletions

View File

@ -196,15 +196,13 @@ EXPORT_SYMBOL(sk_stream_error);
void __sk_stream_mem_reclaim(struct sock *sk) void __sk_stream_mem_reclaim(struct sock *sk)
{ {
if (sk->sk_forward_alloc >= SK_STREAM_MEM_QUANTUM) { atomic_sub(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM,
atomic_sub(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM, sk->sk_prot->memory_allocated);
sk->sk_prot->memory_allocated); sk->sk_forward_alloc &= SK_STREAM_MEM_QUANTUM - 1;
sk->sk_forward_alloc &= SK_STREAM_MEM_QUANTUM - 1; if (*sk->sk_prot->memory_pressure &&
if (*sk->sk_prot->memory_pressure && (atomic_read(sk->sk_prot->memory_allocated) <
(atomic_read(sk->sk_prot->memory_allocated) < sk->sk_prot->sysctl_mem[0]))
sk->sk_prot->sysctl_mem[0])) *sk->sk_prot->memory_pressure = 0;
*sk->sk_prot->memory_pressure = 0;
}
} }
EXPORT_SYMBOL(__sk_stream_mem_reclaim); EXPORT_SYMBOL(__sk_stream_mem_reclaim);