Attachment 193211 Details for Bug 286821 – RHEL5 patch

[patch] RHEL5 patch

gfs2_dlm1.patch (text/plain), 2.17 KB, created by Wendy Cheng on 2007-09-12 05:01:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wendy Cheng

Created: 2007-09-12 05:01:18 UTC

Size: 2.17 KB

patch

obsolete

>--- linux-e45/fs/gfs2/glock.c	2007-09-08 22:05:58.000000000 -0400
>+++ a007/fs/gfs2/glock.c	2007-09-11 22:50:22.000000000 -0400
>@@ -704,7 +704,7 @@ static void gfs2_glmutex_unlock(struct g
>  */
> 
> static void handle_callback(struct gfs2_glock *gl, unsigned int state,
>-			    int remote, unsigned long delay)
>+			    int remote, unsigned long delay, int from_daemon)
> {
> 	int bit = delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE;
> 
>@@ -715,11 +715,17 @@ static void handle_callback(struct gfs2_
> 		gl->gl_demote_time = jiffies;
> 		if (remote && gl->gl_ops->go_type == LM_TYPE_IOPEN &&
> 		    gl->gl_object) {
>-			struct inode *inode = igrab(gl->gl_object);
>-			spin_unlock(&gl->gl_spin);
>-			if (inode) {
>-				d_prune_aliases(inode);
>-				iput(inode);
>+			if (from_daemon) {
>+				gfs2_glock_schedule_for_reclaim(gl);
>+				spin_unlock(&gl->gl_spin);
>+			} else { 
>+				struct inode *inode;
>+				inode = igrab(gl->gl_object);
>+				spin_unlock(&gl->gl_spin);
>+				if (inode) {
>+					d_prune_aliases(inode);
>+					iput(inode);
>+				}
> 			}
> 			return;
> 		}
>@@ -1236,7 +1242,7 @@ void gfs2_glock_dq(struct gfs2_holder *g
> 	unsigned delay = 0;
> 
> 	if (gh->gh_flags & GL_NOCACHE)
>-		handle_callback(gl, LM_ST_UNLOCKED, 0, 0);
>+		handle_callback(gl, LM_ST_UNLOCKED, 0, 0, 0);
> 
> 	gfs2_glmutex_lock(gl);
> 
>@@ -1500,7 +1506,7 @@ static void blocking_cb(struct gfs2_sbd 
> 	if (time_before(now, holdtime))
> 		delay = holdtime - now;
> 
>-	handle_callback(gl, state, 1, delay);
>+	handle_callback(gl, state, 1, delay, 1);
> 	if (queue_delayed_work(glock_workqueue, &gl->gl_work, delay) == 0)
> 		gfs2_glock_put(gl);
> }
>@@ -1637,7 +1643,7 @@ void gfs2_reclaim_glock(struct gfs2_sbd 
> 	if (gfs2_glmutex_trylock(gl)) {
> 		if (list_empty(&gl->gl_holders) &&
> 		    gl->gl_state != LM_ST_UNLOCKED && demote_ok(gl))
>-			handle_callback(gl, LM_ST_UNLOCKED, 0, 0);
>+			handle_callback(gl, LM_ST_UNLOCKED, 0, 0, 0);
> 		gfs2_glmutex_unlock(gl);
> 	}
> 
>@@ -1737,7 +1743,7 @@ static void clear_glock(struct gfs2_gloc
> 	if (gfs2_glmutex_trylock(gl)) {
> 		if (list_empty(&gl->gl_holders) &&
> 		    gl->gl_state != LM_ST_UNLOCKED)
>-			handle_callback(gl, LM_ST_UNLOCKED, 0, 0);
>+			handle_callback(gl, LM_ST_UNLOCKED, 0, 0, 0);
> 		gfs2_glmutex_unlock(gl);
> 	}
> }

Actions: View | Diff

Attachments on bug 286821: 192951 | 192961 | 193211 | 193371