patch-2.4.0-test9 linux/net/sunrpc/xprt.c

• Lines: 19
• Date: Mon Sep 18 15:19:49 2000
• Orig file: v2.4.0-test8/linux/net/sunrpc/xprt.c
• Orig date: Tue Jul 18 12:39:29 2000

diff -u --recursive --new-file v2.4.0-test8/linux/net/sunrpc/xprt.c linux/net/sunrpc/xprt.c
@@ -1037,7 +1037,7 @@
 		return;
 
 	/* Wait until we have enough socket memory */
-	if (sock_wspace(sk) < min(sk->sndbuf,XPRT_MIN_WRITE_SPACE))
+	if (!sock_writeable(sk))
 		return;
 
 	spin_lock_bh(&xprt_sock_lock);
@@ -1212,9 +1212,6 @@
 	 */
 	while (1) {
 		xprt->write_space = 0;
-		status = -ENOMEM;
-		if (sock_wspace(xprt->inet) < req->rq_slen + SOCK_MIN_WRITE_SPACE)
-			break;
 		status = xprt_sendmsg(xprt, req);
 
 		if (status < 0)