Attachment 307354 Details for Bug 449098 – Patch to fix

[patch] Patch to fix

ltimeout.patch (text/plain), 1.11 KB, created by Christine Caulfield on 2008-06-02 12:25:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2008-06-02 12:25:36 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/dlm-kernel/src/ast.c b/dlm-kernel/src/ast.c
>index 34645a9..de07deb 100644
>--- a/dlm-kernel/src/ast.c
>+++ b/dlm-kernel/src/ast.c
>@@ -502,7 +502,8 @@ static void process_lockqueue(void)
> 		if (!test_bit(LSFL_LS_RUN, &ls->ls_flags))
> 			continue;
> 
>-		if (check_timeout(lkb->lkb_lockqueue_time,
>+		if (dlm_config.lock_timeout &&
>+		    check_timeout(lkb->lkb_lockqueue_time,
> 				  dlm_config.lock_timeout)) {
> 			count++;
> 			list_del(&lkb->lkb_lockqueue);
>@@ -517,7 +518,7 @@ static void process_lockqueue(void)
> 		wake_astd();
> 
> 	mod_timer(&_lockqueue_timer,
>-		  jiffies + ((dlm_config.lock_timeout >> 1) * HZ));
>+		  jiffies + ((dlm_config.lock_timeout?((dlm_config.lock_timeout >> 1) * HZ):30*HZ)));
> }
> 
> /* Look for deadlocks */
>@@ -584,7 +585,7 @@ static int dlm_astd(void *data)
> 	_lockqueue_timer.function = lockqueue_timer_fn;
> 	_lockqueue_timer.data = 0;
> 	mod_timer(&_lockqueue_timer,
>-		  jiffies + ((dlm_config.lock_timeout >> 1) * HZ));
>+		  jiffies + ((dlm_config.lock_timeout?((dlm_config.lock_timeout >> 1) * HZ):30*HZ)));
> 
> 	while (!kthread_should_stop()) {
> 		set_current_state(TASK_INTERRUPTIBLE);

Actions: View | Diff

Attachments on bug 449098: 307354