The patch titled
Subject: include/net/sock.h: squelch compiler warning in sk_rmem_schedule()
has been removed from the -mm tree. Its filename was
include-net-sockh-squelch-compiler-warning-in-sk_rmem_schedule.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Subject: 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 <chuck.lever@xxxxxxxxxx>
Signed-off-by: Mel Gorman <mgorman@xxxxxxx>
Cc: David Miller <davem@xxxxxxxxxxxxx>
Cc: Joonsoo Kim <js1304@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/net/sock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/net/sock.h~include-net-sockh-squelch-compiler-warning-in-sk_rmem_schedule include/net/sock.h
--- a/include/net/sock.h~include-net-sockh-squelch-compiler-warning-in-sk_rmem_schedule
+++ a/include/net/sock.h
@@ -1332,7 +1332,7 @@ static inline bool sk_wmem_schedule(stru
}
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;
_
Patches currently in -mm which might be from chuck.lever@xxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
