Attachment 294607 Details for Bug 432370 – Patch that works

[patch] Patch that works

432370.try1.patch (text/plain), 3.06 KB, created by Robert Peterson on 2008-02-11 23:54:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2008-02-11 23:54:24 UTC

Size: 3.06 KB

patch

obsolete

>diff -pur a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>--- a/fs/gfs2/glock.c	2008-02-11 12:23:26.000000000 -0600
>+++ b/fs/gfs2/glock.c	2008-02-11 17:43:25.000000000 -0600
>@@ -485,9 +485,7 @@ static int rq_mutex(struct gfs2_holder *
> 	list_del_init(&gh->gh_list);
> 	/*  gh->gh_error never examined.  */
> 	set_bit(GLF_LOCK, &gl->gl_flags);
>-	clear_bit(HIF_WAIT, &gh->gh_iflags);
>-	smp_mb();
>-	wake_up_bit(&gh->gh_iflags, HIF_WAIT);
>+	gfs2_holder_wake(gh);
> 
> 	return 1;
> }
>@@ -788,6 +786,7 @@ static void drop_bh(struct gfs2_glock *g
> 	spin_lock(&gl->gl_spin);
> 	gfs2_demote_wake(gl);
> 	gl->gl_req_gh = NULL;
>+	clear_bit(GLF_BH_NEEDED, &gl->gl_flags);
> 	clear_bit(GLF_LOCK, &gl->gl_flags);
> 	spin_unlock(&gl->gl_spin);
> 
>@@ -812,7 +811,7 @@ static void xmote_bh(struct gfs2_glock *
> 	int prev_state = gl->gl_state;
> 	int op_done = 1;
> 
>-	if ((ret & LM_OUT_ST_MASK) == LM_ST_UNLOCKED) {
>+	if (!test_bit(GLF_BH_XMOTE, &gl->gl_flags)) {
> 		drop_bh(gl, ret);
> 		return;
> 	}
>@@ -842,6 +841,7 @@ static void xmote_bh(struct gfs2_glock *
> 		} else {
> 			spin_lock(&gl->gl_spin);
> 			if (gl->gl_state != gl->gl_demote_state) {
>+				clear_bit(GLF_BH_NEEDED, &gl->gl_flags);
> 				spin_unlock(&gl->gl_spin);
> 				gfs2_glock_drop_th(gl);
> 				gfs2_glock_put(gl);
>@@ -883,6 +883,7 @@ out:
> 	if (op_done) {
> 		spin_lock(&gl->gl_spin);
> 		gl->gl_req_gh = NULL;
>+		clear_bit(GLF_BH_NEEDED, &gl->gl_flags);
> 		clear_bit(GLF_LOCK, &gl->gl_flags);
> 		spin_unlock(&gl->gl_spin);
> 	}
>@@ -921,6 +922,8 @@ static void gfs2_glock_xmote_th(struct g
> 	gfs2_assert_warn(sdp, state != gl->gl_state);
> 
> 	gfs2_glock_hold(gl);
>+	set_bit(GLF_BH_NEEDED, &gl->gl_flags);
>+	set_bit(GLF_BH_XMOTE, &gl->gl_flags);
> 
> 	lck_ret = gfs2_lm_lock(sdp, gl->gl_lock, gl->gl_state, state, lck_flags);
> 
>@@ -953,6 +956,8 @@ static void gfs2_glock_drop_th(struct gf
> 	gfs2_assert_warn(sdp, gl->gl_state != LM_ST_UNLOCKED);
> 
> 	gfs2_glock_hold(gl);
>+	set_bit(GLF_BH_NEEDED, &gl->gl_flags);
>+	clear_bit(GLF_BH_XMOTE, &gl->gl_flags);
> 
> 	ret = gfs2_lm_unlock(sdp, gl->gl_lock, gl->gl_state);
> 
>@@ -981,7 +986,9 @@ static void do_cancels(struct gfs2_holde
> 	while (gl->gl_req_gh != gh &&
> 	       !test_bit(HIF_HOLDER, &gh->gh_iflags) &&
> 	       !list_empty(&gh->gh_list)) {
>-		if (!(gl->gl_req_gh && (gl->gl_req_gh->gh_flags & GL_NOCANCEL))) {
>+		if (test_bit(GLF_BH_NEEDED, &gl->gl_flags) &&
>+		    !(gl->gl_req_gh &&
>+		      (gl->gl_req_gh->gh_flags & GL_NOCANCEL))) {
> 			spin_unlock(&gl->gl_spin);
> 			gfs2_lm_cancel(gl->gl_sbd, gl->gl_lock);
> 			msleep(100);
>@@ -1051,6 +1058,7 @@ static int glock_wait_internal(struct gf
> 
> 		spin_lock(&gl->gl_spin);
> 		gl->gl_req_gh = NULL;
>+		clear_bit(GLF_BH_NEEDED, &gl->gl_flags);
> 		clear_bit(GLF_LOCK, &gl->gl_flags);
> 		run_queue(gl);
> 		spin_unlock(&gl->gl_spin);
>diff -pur a/fs/gfs2/incore.h b/fs/gfs2/incore.h
>--- a/fs/gfs2/incore.h	2008-02-11 12:23:26.000000000 -0600
>+++ b/fs/gfs2/incore.h	2008-02-11 17:43:25.000000000 -0600
>@@ -171,6 +171,8 @@ enum {
> 	GLF_DEMOTE_IN_PROGRESS	= 6,
> 	GLF_LFLUSH              = 7,
> 	GLF_WAITERS2            = 8,
>+	GLF_BH_NEEDED           = 9,
>+	GLF_BH_XMOTE            = 10,
> };
> 
> struct gfs2_glock {

Actions: View | Diff

Attachments on bug 432370: 294607 | 294646