patch-2.1.124 linux/net/sunrpc/xprt.c

• Lines: 78
• Date: Tue Sep 29 20:42:56 1998
• Orig file: v2.1.123/linux/net/sunrpc/xprt.c
• Orig date: Mon Sep 28 10:51:36 1998

diff -u --recursive --new-file v2.1.123/linux/net/sunrpc/xprt.c linux/net/sunrpc/xprt.c
@@ -310,7 +310,7 @@
 		if ((cwnd >>= 1) < RPC_CWNDSCALE)
 			cwnd = RPC_CWNDSCALE;
 		xprt->congtime = jiffies + ((cwnd * HZ) << 3) / RPC_CWNDSCALE;
-		dprintk("RPC:      cong %08lx, cwnd was %08lx, now %08lx, "
+		dprintk("RPC:      cong %ld, cwnd was %ld, now %ld, "
 			"time %ld ms\n", xprt->cong, xprt->cwnd, cwnd,
 			(xprt->congtime-jiffies)*1000/HZ);
 		pprintk("RPC: %lu %ld cwnd\n", jiffies, cwnd);
@@ -884,11 +884,14 @@
 static void
 xprt_timer(struct rpc_task *task)
 {
-	if (task->tk_rqstp)
+	struct rpc_rqst	*req = task->tk_rqstp;
+
+	if (req) {
 		xprt_adjust_cwnd(task->tk_xprt, -ETIMEDOUT);
+	}
 
-	dprintk("RPC: %4d xprt_timer (%s request)\n", task->tk_pid,
-			task->tk_rqstp? "pending" : "backlogged");
+	dprintk("RPC: %4d xprt_timer (%s request)\n",
+		task->tk_pid, req ? "pending" : "backlogged");
 
 	task->tk_status  = -ETIMEDOUT;
 	task->tk_timeout = 0;
@@ -1155,12 +1158,13 @@
 	return;
 
 bad_list:
-	printk("RPC: %4d inconsistent free list (cong %ld cwnd %ld)\n",
+	printk(KERN_ERR 
+		"RPC: %4d inconsistent free list (cong %ld cwnd %ld)\n",
 		task->tk_pid, xprt->cong, xprt->cwnd);
 	rpc_debug = ~0;
 	goto bummer;
 bad_used:
-	printk("RPC: used rqst slot %p on free list!\n", req);
+	printk(KERN_ERR "RPC: used rqst slot %p on free list!\n", req);
 bummer:
 	task->tk_status = -EIO;
 	xprt->free = NULL;
@@ -1216,12 +1220,16 @@
 	}
 	end_bh_atomic();
 
-	/* Decrease congestion value. If congestion threshold is not yet
-	 * reached, pass on the request slot.
+	/* Decrease congestion value. */
+	xprt->cong -= RPC_CWNDSCALE;
+
+#if 0
+	/* If congestion threshold is not yet reached, pass on the request slot.
 	 * This looks kind of kludgy, but it guarantees backlogged requests
 	 * are served in order.
+	 * N.B. This doesn't look completely safe, as the task is still
+	 * on the backlog list after wake-up.
 	 */
-	xprt->cong -= RPC_CWNDSCALE;
 	if (!RPCXPRT_CONGESTED(xprt)) {
 		struct rpc_task	*next = rpc_wake_up_next(&xprt->backlog);
 
@@ -1232,9 +1240,14 @@
 			return;
 		}
 	}
+#endif
 
 	req->rq_next = xprt->free;
 	xprt->free   = req;
+
+	/* If not congested, wake up the next backlogged process */
+	if (!RPCXPRT_CONGESTED(xprt))
+		rpc_wake_up_next(&xprt->backlog);
 }
 
 /*