Attachment 317946 Details for Bug 461085 – Fix patch for kernel-2.6.9-42.EL

[patch] Fix patch for kernel-2.6.9-42.EL

svc-rhel44.diff (text/plain), 1.46 KB, created by Hiroaki Nakano on 2008-09-29 10:06:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroaki Nakano

Created: 2008-09-29 10:06:35 UTC

Size: 1.46 KB

patch

obsolete

>diff -urPN linux-2.6.9.org/fs/lockd/svc.c linux-2.6.9-svc_fix/fs/lockd/svc.c
>--- linux-2.6.9.org/fs/lockd/svc.c	2008-08-07 10:26:31.000000000 +0900
>+++ linux-2.6.9-svc_fix/fs/lockd/svc.c	2008-09-29 17:31:00.000000000 +0900
>@@ -68,6 +68,8 @@
> 
> static struct ctl_table_header * nlm_sysctl_table;
> 
>+static struct timer_list        nlm_period_timer;
>+
> static unsigned long set_grace_period(void)
> {
> 	unsigned long grace_period;
>@@ -167,6 +169,12 @@
> 
> 	grace_period_expire = set_grace_period();
> 
>+	init_timer(&nlm_period_timer);
>+	nlm_period_timer.function = clear_grace_period;
>+	nlm_period_timer.expires = grace_period_expire;
>+
>+	add_timer(&nlm_period_timer);
>+
> 	/*
> 	 * The main request loop. We don't terminate until the last
> 	 * NFS mount or NFS daemon has gone away, and we've been sent a
>@@ -180,6 +188,7 @@
> 			if (nlmsvc_ops) {
> 				nlmsvc_invalidate_all();
> 				grace_period_expire = set_grace_period();
>+				mod_timer(&nlm_period_timer, grace_period_expire);
> 			}
> 		}
> 
>@@ -189,10 +198,8 @@
> 		 * (Theoretically, there shouldn't even be blocked locks
> 		 * during grace period).
> 		 */
>-		if (!nlmsvc_grace_period) {
>+		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
>@@ -216,6 +223,7 @@
> 	}
> 
> 	flush_signals(current);
>+	del_timer(&nlm_period_timer);
> 
> 	/*
> 	 * Check whether there's a new lockd process before

Actions: View | Diff

Attachments on bug 461085: 317946 | 325689