kNFS(lockd) patch for linux-2.4.19

[Juan Gomez]

Marcelo,

Would you please consider the attached patch for inclusion in 2.4..*?
The patch solves a faulty delay observed by the first client that access
lockd just after the grace period.

Juan
diff -ru linux-2.4.19/fs/lockd/svc.c linux-2.4.19-plus-delay-patch/fs/lockd/svc.c
--- linux-2.4.19/fs/lockd/svc.c	Sun Oct 21 10:32:33 2001
+++ linux-2.4.19-plus-delay-patch/fs/lockd/svc.c	Tue Oct  8 13:19:40 2002
@@ -144,8 +144,7 @@
 		 */
 		if (!nlmsvc_grace_period) {
 			timeout = nlmsvc_retry_blocked();
-		} else if (time_before(grace_period_expire, jiffies))
-			clear_grace_period();
+		} 
 
 		/*
 		 * Find a socket with data available and call its
@@ -163,6 +162,22 @@
 
 		dprintk("lockd: request from %08x\n",
 			(unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr));
+                /* 
+                 * We need to do the clear/grace period here and not before 
+                 * svc_recv() because svc_recv() may sleep longer than the 
+                 * grace period and the first request may be falsely processed
+                 * as if the server was in the grace period when it was not 
+                 * causing unnecessary delays for the first request received.
+                 * Juan C. Gomez [e-mail]
+                 */
+                
+                if (nlmsvc_grace_period 
+                    &&
+                    time_before(grace_period_expire, jiffies)) {
+                         clear_grace_period();
+                }
+                  
+
 
 		/*
 		 * Look up the NFS client handle. The handle is needed for