Attachment 309244 Details for Bug 447748 – Second of the upstream patches

[patch] Second of the upstream patches

0008-GFS2-Remove-obsolete-conversion-deadlock-avoidance.patch (text/plain), 2.36 KB, created by Steve Whitehouse on 2008-06-13 16:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-06-13 16:41:48 UTC

Size: 2.36 KB

patch

obsolete

>From d78191ffe5e241dfb3991ff2523fc2c9f0ffa15e Mon Sep 17 00:00:00 2001
>From: Steven Whitehouse <swhiteho@redhat.com>
>Date: Tue, 3 Jun 2008 14:34:14 +0100
>Subject: [PATCH] [GFS2] Remove obsolete conversion deadlock avoidance code
>
>This is only used by GFS1 so can be removed.
>
>Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
>
>diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
>index 871ffc9..894df45 100644
>--- a/fs/gfs2/locking/dlm/lock.c
>+++ b/fs/gfs2/locking/dlm/lock.c
>@@ -80,7 +80,6 @@ static void process_complete(struct gdlm_lock *lp)
> {
> 	struct gdlm_ls *ls = lp->ls;
> 	struct lm_async_cb acb;
>-	s16 prev_mode = lp->cur;
> 
> 	memset(&acb, 0, sizeof(acb));
> 
>@@ -160,15 +159,7 @@ static void process_complete(struct gdlm_lock *lp)
> 			 lp->lksb.sb_status, lp->lockname.ln_type,
> 			 (unsigned long long)lp->lockname.ln_number,
> 			 lp->flags);
>-		if (lp->lksb.sb_status == -EDEADLOCK &&
>-		    lp->ls->fsflags & LM_MFLAG_CONV_NODROP) {
>-			lp->req = lp->cur;
>-			acb.lc_ret |= LM_OUT_CONV_DEADLK;
>-			if (lp->cur == DLM_LOCK_IV)
>-				lp->lksb.sb_lkid = 0;
>-			goto out;
>-		} else
>-			return;
>+		return;
> 	}
> 
> 	/*
>@@ -268,10 +259,6 @@ out:
> 	acb.lc_name = lp->lockname;
> 	acb.lc_ret |= gdlm_make_lmstate(lp->cur);
> 
>-	if (!test_and_clear_bit(LFL_NOCACHE, &lp->flags) &&
>-	    (lp->cur > DLM_LOCK_NL) && (prev_mode > DLM_LOCK_NL))
>-		acb.lc_ret |= LM_OUT_CACHEABLE;
>-
> 	ls->fscb(ls->sdp, LM_CB_ASYNC, &acb);
> }
> 
>@@ -376,14 +363,6 @@ static inline unsigned int make_flags(struct gdlm_lock *lp,
> 
> 	if (lp->lksb.sb_lkid != 0) {
> 		lkf |= DLM_LKF_CONVERT;
>-
>-		/* Conversion deadlock avoidance by DLM */
>-
>-		if (!(lp->ls->fsflags & LM_MFLAG_CONV_NODROP) &&
>-		    !test_bit(LFL_FORCE_PROMOTE, &lp->flags) &&
>-		    !(lkf & DLM_LKF_NOQUEUE) &&
>-		    cur > DLM_LOCK_NL && req > DLM_LOCK_NL && cur != req)
>-			lkf |= DLM_LKF_CONVDEADLK;
> 	}
> 
> 	if (lp->lvb)
>diff --git a/include/linux/lm_interface.h b/include/linux/lm_interface.h
>index d0a7112..2ed8fa1 100644
>--- a/include/linux/lm_interface.h
>+++ b/include/linux/lm_interface.h
>@@ -122,11 +122,9 @@ typedef void (*lm_callback_t) (void *ptr, unsigned int type, void *data);
>  */
> 
> #define LM_OUT_ST_MASK		0x00000003
>-#define LM_OUT_CACHEABLE	0x00000004
> #define LM_OUT_CANCELED		0x00000008
> #define LM_OUT_ASYNC		0x00000080
> #define LM_OUT_ERROR		0x00000100
>-#define LM_OUT_CONV_DEADLK	0x00000200
> 
> /*
>  * lm_callback_t types
>-- 
>1.5.1.2
>

Actions: View | Diff

Attachments on bug 447748: 307210 | 309243 | 309244 | 309246 | 309248 | 309253 | 309545 | 310134 | 311171