[rds-commits] zab commits r135 - trunk/linux/net/rds

[svn-commits@oss.oracle.com]

Author: zab
Date: 2006-07-26 17:46:13 -0500 (Wed, 26 Jul 2006)
New Revision: 135

Modified:
   trunk/linux/net/rds/recv.c
Log:
Always raise MSG_TRUNC when the recvmsg is truncated.


Modified: trunk/linux/net/rds/recv.c
===================================================================
--- trunk/linux/net/rds/recv.c	2006-07-26 22:22:45 UTC (rev 134)
+++ trunk/linux/net/rds/recv.c	2006-07-26 22:46:13 UTC (rev 135)
@@ -217,6 +217,8 @@
 	/* udp_recvmsg()->sock_recvtimeo() gets away without locking too.. */
 	timeo = sock_rcvtimeo(sk, nonblock);
 
+	rdsdebug("size %zu flags 0x%x timeo %ld\n", size, msg_flags, timeo);
+
 	if (msg_flags & MSG_OOB)
 		goto out;
 
@@ -262,8 +264,7 @@
 		}
 
 		if (ret < be32_to_cpu(inc->i_hdr.h_len)) {
-			if (msg_flags & MSG_TRUNC)
-				ret = be32_to_cpu(inc->i_hdr.h_len);
+			ret = be32_to_cpu(inc->i_hdr.h_len);
 			msg->msg_flags |= MSG_TRUNC;
 		}