RE: [BUG] NFS in 2.4.20-pre6+ stalls

* RE: [BUG] NFS in 2.4.20-pre6+ stalls
@ 2002-09-25 12:41 Trond Myklebust
  2002-09-25 15:30 ` Richard Gooch
  0 siblings, 1 reply; 7+ messages in thread
From: Trond Myklebust @ 2002-09-25 12:41 UTC (permalink / raw)
  To: Richard Gooch; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

>   Hi, all. Just noticed this with 2.4.20-pre6 (and -pre7): NFS write
> sometimes (usually) stalls for minutes at a time. This problem wasn't

Richard,
  Does the appended patch make a difference?

Cheers,
  Trond


[-- Attachment #2: resend.dif --]
[-- Type: text/plain, Size: 910 bytes --]

--- linux/net/sunrpc/xprt.c.orig	Fri Aug 30 20:16:17 2002
+++ linux/net/sunrpc/xprt.c	Tue Sep 24 00:08:59 2002
@@ -171,10 +171,10 @@
 
 	if (xprt->snd_task)
 		return;
-	if (!xprt->nocong && RPCXPRT_CONGESTED(xprt))
-		return;
 	task = rpc_wake_up_next(&xprt->resend);
 	if (!task) {
+		if (!xprt->nocong && RPCXPRT_CONGESTED(xprt))
+			return;
 		task = rpc_wake_up_next(&xprt->sending);
 		if (!task)
 			return;
@@ -1013,7 +1013,6 @@
 		}
 		rpc_inc_timeo(&task->tk_client->cl_rtt);
 		xprt_adjust_cwnd(req->rq_xprt, -ETIMEDOUT);
-		__xprt_put_cong(xprt, req);
 	}
 	req->rq_nresend++;
 
@@ -1150,10 +1149,7 @@
 		req->rq_bytes_sent = 0;
 	}
  out_release:
-	spin_lock_bh(&xprt->sock_lock);
-	__xprt_release_write(xprt, task);
-	__xprt_put_cong(xprt, req);
-	spin_unlock_bh(&xprt->sock_lock);
+	xprt_release_write(xprt, task);
 	return;
  out_receive:
 	dprintk("RPC: %4d xmit complete\n", task->tk_pid);



^ permalink raw reply	[flat|nested] 7+ messages in thread