patch-2.2.0-pre1 linux/net/sunrpc/xprt.c

Next file: linux/net/wanrouter/wanmain.c
Previous file: linux/net/sunrpc/auth.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.132/linux/net/sunrpc/xprt.c linux/net/sunrpc/xprt.c
@@ -293,7 +293,7 @@
 	if (xprt->nocong)
 		return;
 	if (result >= 0) {
-		if (xprt->cong < cwnd || jiffies < xprt->congtime)
+		if (xprt->cong < cwnd || time_before(jiffies, xprt->congtime))
 			return;
 		/* The (cwnd >> 1) term makes sure
 		 * the result gets rounded properly. */
@@ -543,7 +543,7 @@
 		pkt_cnt++;
 		pkt_len += req->rq_slen + copied;
 		pkt_rtt += jiffies - req->rq_xtime;
-		if (nextstat < jiffies) {
+		if (time_after(jiffies, nextstat)) {
 			printk("RPC: %lu %ld cwnd\n", jiffies, xprt->cwnd);
 			printk("RPC: %ld %ld %ld %ld stat\n",
 					jiffies, pkt_cnt, pkt_len, pkt_rtt);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov