Attachment 191461 Details for Bug 280161 – Patch to fix

[patch] Patch to fix

pf-device.patch (text/plain), 1.14 KB, created by Christine Caulfield on 2007-09-10 07:51:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-09-10 07:51:30 UTC

Size: 1.14 KB

patch

obsolete

>Index: device.c
>===================================================================
>RCS file: /cvs/cluster/cluster/dlm-kernel/src/Attic/device.c,v
>retrieving revision 1.24.2.9
>diff -u -p -r1.24.2.9 device.c
>--- device.c	14 Aug 2006 21:11:31 -0000	1.24.2.9
>+++ device.c	10 Sep 2007 07:49:31 -0000
>@@ -544,13 +544,20 @@ static int dlm_close(struct inode *inode
> 
> 			/* If it was waiting for a conversion, it will
> 			   now be granted so we can unlock it properly */
>-			if (lock_status == GDLM_LKSTS_CONVERT) {
>-				flags &= ~DLM_LKF_CANCEL;
>-				clear_bit(LI_FLAG_COMPLETE, &li.li_flags);
>-				status = dlm_unlock(f->fi_ls->ls_lockspace, lkb->lkb_id, flags, &li.li_lksb, &li);
>-
>-				if (status == 0)
>-					wait_for_ast(&li);
>+			if (lock_status == GDLM_LKSTS_CONVERT || status == -EBUSY) {
>+				do {
>+					flags &= ~DLM_LKF_CANCEL;
>+					clear_bit(LI_FLAG_COMPLETE, &li.li_flags);
>+					status = dlm_unlock(f->fi_ls->ls_lockspace, lkb->lkb_id, flags, &li.li_lksb, &li);
>+
>+					if (status == 0)
>+						wait_for_ast(&li);
>+
>+					if (status == -EBUSY) {
>+						printk("CC: Sleeping after EBUSY\n");
>+						msleep(1);
>+					}
>+				} while (status == -EBUSY);
> 			}
> 		}
>

Actions: View | Diff

Attachments on bug 280161: 191461