mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Trond Myklebust <trond.myklebust@fys.uio.no>
To: Voluspa <wormprotection-lista3@comhem.se>
Cc: linux-kernel@vger.kernel.org
Subject: Re: NFS on 2.6.0-test9:
Date: Sun, 9 Nov 2003 17:04:05 -0500	[thread overview]
Message-ID: <16302.47573.483168.397844@charged.uio.no> (raw)
In-Reply-To: <20031109222358.78a8d403.wormprotection-lista3@comhem.se>


OK. That points squarely at the RTO timeout "inheritance" change.
There are 2 differences as it stands in 2.6.0 w.r.t. the 2.4.23-pre
code: the no upper limit, and the inheritance update algorithm.

Could you therefore try the following patch.

Cheers,
  Trond

diff -u --recursive --new-file linux-2.6.0-test9/include/linux/sunrpc/timer.h linux/include/linux/sunrpc/timer.h
--- linux-2.6.0-test9/include/linux/sunrpc/timer.h	2003-11-07 21:03:45.000000000 -0500
+++ linux/include/linux/sunrpc/timer.h	2003-11-09 16:55:43.000000000 -0500
@@ -25,9 +25,18 @@
 
 static inline void rpc_set_timeo(struct rpc_rtt *rt, int timer, int ntimeo)
 {
+	int *t;
 	if (!timer)
 		return;
-	rt->ntimeouts[timer-1] = ntimeo;
+	t = &rt->ntimeouts[timer-1];
+	if (ntimeo < *t) {
+		if (*t > 0)
+			(*t)--;
+	} else {
+		if (ntimeo > 8)
+			ntimeo = 8;
+		*t = ntimeo;
+	}
 }
 
 static inline int rpc_ntimeo(struct rpc_rtt *rt, int timer)
diff -u --recursive --new-file linux-2.6.0-test9/net/sunrpc/timer.c linux/net/sunrpc/timer.c
--- linux-2.6.0-test9/net/sunrpc/timer.c	2003-11-07 21:06:11.000000000 -0500
+++ linux/net/sunrpc/timer.c	2003-11-09 16:57:15.000000000 -0500
@@ -40,6 +40,7 @@
 		rt->srtt[i] = init;
 		rt->sdrtt[i] = RPC_RTO_INIT;
 	}
+	memset(rt->ntimeouts, 0, sizeof(rt->ntimeouts));
 }
 
 /*


  reply	other threads:[~2003-11-09 22:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-11-03 15:34 Voluspa
2003-11-03 16:09 ` Trond Myklebust
2003-11-03 17:13   ` Voluspa
2003-11-09 21:23   ` Voluspa
2003-11-09 22:04     ` Trond Myklebust [this message]
2003-11-10  7:06 Voluspa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=16302.47573.483168.397844@charged.uio.no \
    --to=trond.myklebust@fys.uio.no \
    --cc=linux-kernel@vger.kernel.org \
    --cc=wormprotection-lista3@comhem.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®