Attachment 105445 Details for Bug 132726 – Updated patch

[patch] Updated patch

linux-2.6.8-lockd-racewarn2.patch (text/plain), 2.30 KB, created by Steve Dickson on 2004-10-19 12:03:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2004-10-19 12:03:18 UTC

Size: 2.30 KB

patch

obsolete

>--- linux-2.6.8/fs/lockd/clntlock.c.org	2004-09-27 10:03:38.000000000 -0400
>+++ linux-2.6.8/fs/lockd/clntlock.c	2004-09-27 10:03:52.000000000 -0400
>@@ -50,14 +50,19 @@ nlmclnt_block(struct nlm_host *host, str
> 	struct nlm_wait	block, **head;
> 	int		err;
> 	u32		pstate;
>+	wait_queue_t __wait;
> 
> 	block.b_host   = host;
> 	block.b_lock   = fl;
>-	init_waitqueue_head(&block.b_wait);
> 	block.b_status = NLM_LCK_BLOCKED;
>+	init_waitqueue_entry(&__wait, current);
>+	init_waitqueue_head(&block.b_wait);
>+	add_wait_queue(&block.b_wait, &__wait);
>+
> 	block.b_next   = nlm_blocked;
> 	nlm_blocked    = &block;
> 
>+
> 	/* Remember pseudo nsm state */
> 	pstate = host->h_state;
> 
>@@ -69,8 +74,7 @@ nlmclnt_block(struct nlm_host *host, str
> 	 * a 1 minute timeout would do. See the comment before
> 	 * nlmclnt_lock for an explanation.
> 	 */
>-	sleep_on_timeout(&block.b_wait, 30*HZ);
>-	#warning race
>+	schedule_timeout(30*HZ);
> 
> 	for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
> 		if (*head == &block) {
>@@ -78,6 +82,7 @@ nlmclnt_block(struct nlm_host *host, str
> 			break;
> 		}
> 	}
>+	remove_wait_queue(&block.b_wait, &__wait);
> 
> 	if (!signalled()) {
> 		*statp = block.b_status;
>--- linux-2.6.8/fs/lockd/svc.c.org	2004-09-25 05:52:57.000000000 -0400
>+++ linux-2.6.8/fs/lockd/svc.c	2004-09-28 17:14:29.731453016 -0400
>@@ -278,6 +278,8 @@ void
> lockd_down(void)
> {
> 	static int warned;
>+	wait_queue_t __wait;
>+	int retries=0;
> 
> 	down(&nlmsvc_sema);
> 	if (nlmsvc_users) {
>@@ -294,20 +296,33 @@ lockd_down(void)
> 	warned = 0;
> 
> 	kill_proc(nlmsvc_pid, SIGKILL, 1);
>+
>+	init_waitqueue_entry(&__wait, current);
>+	add_wait_queue(&lockd_exit,  &__wait);
>+
> 	/*
> 	 * Wait for the lockd process to exit, but since we're holding
> 	 * the lockd semaphore, we can't wait around forever ...
> 	 */
> 	clear_thread_flag(TIF_SIGPENDING);
>-	interruptible_sleep_on_timeout(&lockd_exit, HZ);
>-	if (nlmsvc_pid) {
>+	set_current_state(TASK_UNINTERRUPTIBLE);
>+	while (nlmsvc_pid) {
>+
>+		schedule_timeout(HZ);
>+		if (retries++ < 3)
>+			continue;
>+
> 		printk(KERN_WARNING 
> 			"lockd_down: lockd failed to exit, clearing pid\n");
> 		nlmsvc_pid = 0;
> 	}
>+	set_current_state(TASK_RUNNING);
>+	remove_wait_queue(&lockd_exit,  &__wait);
>+
> 	spin_lock_irq(&current->sighand->siglock);
> 	recalc_sigpending();
> 	spin_unlock_irq(&current->sighand->siglock);
>+
> out:
> 	up(&nlmsvc_sema);
> }

Actions: View | Diff

Attachments on bug 132726: 105137 | 105445