Attachment 306191 Details for Bug 432057 – Dave's patch to dlm

[patch] Dave's patch to dlm

dlm-cw-bast.patch (text/plain), 1.21 KB, created by Robert Peterson on 2008-05-20 23:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2008-05-20 23:50:20 UTC

Size: 1.21 KB

patch

obsolete

>commit e76557f7de6e7b7308ff84abe924924953160511
>Author: David Teigland <teigland@redhat.com>
>Date:   Tue May 20 12:18:10 2008 -0500
>
>    dlm: fix basts for granted CW waiting PR/CW
>    
>    The fix in commit 3650925893469ccb03dbcc6a440c5d363350f591 was addressing
>    the case of a granted PR lock with waiting PR and CW locks.  It's a
>    special case that requires forcing a CW bast.  However, that forced CW
>    bast was incorrectly applying to a second condition where the granted
>    lock was CW.  So, the holder of a CW lock could receive an extraneous CW
>    bast instead of a PR bast.  This fix narrows the original special case to
>    what was intended.
>    
>    Signed-off-by: David Teigland <teigland@redhat.com>
>
>diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
>index 2d3d102..7ba9586 100644
>--- a/fs/dlm/lock.c
>+++ b/fs/dlm/lock.c
>@@ -1782,7 +1782,8 @@ static void grant_pending_locks(struct dlm_rsb *r)
> 
> 	list_for_each_entry_safe(lkb, s, &r->res_grantqueue, lkb_statequeue) {
> 		if (lkb->lkb_bastfn && lock_requires_bast(lkb, high, cw)) {
>-			if (cw && high == DLM_LOCK_PR)
>+			if (cw && high == DLM_LOCK_PR &&
>+			    lkb->lkb_grmode == DLM_LOCK_PR)
> 				queue_bast(r, lkb, DLM_LOCK_CW);
> 			else
> 				queue_bast(r, lkb, high);

Actions: View | Diff

Attachments on bug 432057: 294383 | 295614 | 296569 | 297894 | 298191 | 302891 | 303203 | 303208 | 303209 | 303500 | 303542 | 303631 | 303637 | 303646 | 304026 | 304098 | 304112 | 304161 | 304398 | 304409 | 304572 | 304636 | 304637 | 304749 | 304755 | 304811 | 304837 | 304876 | 304898 | 304946 | 304955 | 304976 | 304984 | 305126 | 305185 | 305237 | 305266 | 305377 | 305387 | 305404 | 305506 | 305513 | 305678 | 305702 | 305727 | 306084 | 306111 | 306191 | 306207 | 306208 | 306275 | 306287 | 306832 | 306972 | 307077 | 307096 | 307158