From: Chuck Lever Date: Fri, 7 Sep 2012 00:17:45 +0000 (+1000) Subject: include/net/sock.h: squelch compiler warning in sk_rmem_schedule() X-Git-Tag: next-20120907~1^2~238 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61fdb7ce52cc53a5d51e1f189767a411ae5c52c6;p=karo-tx-linux.git include/net/sock.h: squelch compiler warning in sk_rmem_schedule() In file included from linux/include/linux/tcp.h:227:0, from linux/include/linux/ipv6.h:221, from linux/include/net/ipv6.h:16, from linux/include/linux/sunrpc/clnt.h:26, from linux/net/sunrpc/stats.c:22: linux/include/net/sock.h: In function `sk_rmem_schedule': linux/nfs-2.6/include/net/sock.h:1339:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Seen with gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2) using the -Wextra option. c76562b6 ("netvm: prevent a stream-specific deadlock") accidentally replaced the "size" parameter of sk_rmem_schedule() with an unsigned int. This changes the semantics of the comparison in the return statement. In sk_wmem_schedule we have syntactically the same comparison, but "size" is a signed integer. In addition, __sk_mem_schedule() takes a signed integer for its "size" parameter, so there is an implicit type conversion in sk_rmem_schedule() anyway. Revert the "size" parameter back to a signed integer so that the semantics of the expressions in both sk_[rw]mem_schedule() are exactly the same. Signed-off-by: Chuck Lever Signed-off-by: Mel Gorman Cc: David Miller Cc: Joonsoo Kim Cc: David Rientjes Cc: Pekka Enberg Signed-off-by: Andrew Morton --- diff --git a/include/net/sock.h b/include/net/sock.h index 84bdaeca1314..9f10bd29b463 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1341,7 +1341,7 @@ static inline bool sk_wmem_schedule(struct sock *sk, int size) } static inline bool -sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, unsigned int size) +sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size) { if (!sk_has_account(sk)) return true;