Re: For Testing - updated RH7.1 XFS 2.4.9-6 kernels

[Tad Dolphay <tbd@xxxxxxx>]

> 
> On Tue, 23 Oct 2001 at 8:38pm, Eric Sandeen wrote
> 
> > Changes:
> > 
> > * LVM now compiles (!) & updated to 1.0.1rc4, module 
> >   included in binary RPMs. (Thanks Martin!)
> > 
> > * bcm5820 & intermezzo unresolved symbols fixed
> > 
> > * kernel-source package fixed (includes linux/kdb files)
> 
> Does it/will it include the fix for the NFS locking issues which have been 
> reported?
> 

I haven't checked but here's the patch.

--- linux-2.4.9-6/fs/lockd/svc.c.orig   Thu Oct 18 15:00:46 2001
+++ linux-2.4.9-6/fs/lockd/svc.c        Mon Oct 22 10:25:21 2001
@@ -122,6 +122,15 @@
                        if (nlmsvc_ops) {
                                nlmsvc_ops->detach();
                                grace_period_expire = nlmsvc_grace_period + 
jiffies;
+#ifdef RPC_DEBUG
+                               nlmsvc_grace_period = 10 * HZ;
+#else
+                               if (nlm_grace_period)
+                                       nlmsvc_grace_period = 
((nlm_grace_period + nlm_timeout - 1)
+                                                               / nlm_timeout) 
* nlm_timeout * HZ;
+                               else
+                                       nlmsvc_grace_period = 5 * nlm_timeout * 
HZ;
+#endif
                        }
                }

@@ -133,8 +142,10 @@
                 */
                if (!grace_period_expire) {
                        timeout = nlmsvc_retry_blocked();
-               } else if (time_before(grace_period_expire, jiffies))
+               } else if (time_before(grace_period_expire, jiffies)) {
                        grace_period_expire = 0;
+                       nlmsvc_grace_period = 0;
+               }

                /*
                 * Find a socket with data available and call its