From 3caf9ca8634fb3a91ab94a09dd8acf7318f0bbda Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 24 Dec 2007 20:57:56 -0800 Subject: [PATCH] --- yaml --- r: 78629 b: refs/heads/master c: 21371f768bf7127ee45bfaadd17899df6a439e8f h: refs/heads/master i: 78627: 86a8ec5f587827b0899b6a9f6f59573bd46d6570 v: v3 --- [refs] | 2 +- trunk/include/net/sock.h | 3 ++- trunk/net/core/stream.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3bf087717336..ba12ec9e8d05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b15c4bcd15741b31019379298edfca28dc78029d +refs/heads/master: 21371f768bf7127ee45bfaadd17899df6a439e8f diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index e178b49eefbb..d27ba6fdd039 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -716,10 +716,11 @@ extern void __sk_stream_mem_reclaim(struct sock *sk); extern int sk_stream_mem_schedule(struct sock *sk, int size, int kind); #define SK_STREAM_MEM_QUANTUM ((int)PAGE_SIZE) +#define SK_STREAM_MEM_QUANTUM_SHIFT ilog2(SK_STREAM_MEM_QUANTUM) static inline int sk_stream_pages(int amt) { - return DIV_ROUND_UP(amt, SK_STREAM_MEM_QUANTUM); + return (amt + SK_STREAM_MEM_QUANTUM - 1) >> SK_STREAM_MEM_QUANTUM_SHIFT; } static inline void sk_stream_mem_reclaim(struct sock *sk) diff --git a/trunk/net/core/stream.c b/trunk/net/core/stream.c index 5586879bb9b3..bf188ffdbdbe 100644 --- a/trunk/net/core/stream.c +++ b/trunk/net/core/stream.c @@ -196,7 +196,7 @@ EXPORT_SYMBOL(sk_stream_error); void __sk_stream_mem_reclaim(struct sock *sk) { - atomic_sub(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM, + atomic_sub(sk->sk_forward_alloc >> SK_STREAM_MEM_QUANTUM_SHIFT, sk->sk_prot->memory_allocated); sk->sk_forward_alloc &= SK_STREAM_MEM_QUANTUM - 1; if (*sk->sk_prot->memory_pressure &&