Attachment 151413 Details for Bug 231910 – An updated test patch

[patch] An updated test patch

glock-test-patch2.diff (text/plain), 2.75 KB, created by Steve Whitehouse on 2007-04-02 10:42:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-04-02 10:42:31 UTC

Size: 2.75 KB

patch

obsolete

>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index d2e3094..b4398ec 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -117,6 +117,16 @@ static inline rwlock_t *gl_lock_addr(unsigned int x)
> }
> #endif
> 
>+static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl);
>+
>+void glock_in_wrong_state(struct gfs2_glock *gl, const char *msg)
>+{
>+	print_symbol(KERN_INFO "tried to demote glock in transaction from %s\n", gl->gl_demoter);
>+	printk(KERN_INFO "%s: pid %d\n", msg, gl->gl_demote_task->pid);
>+	dump_glock(NULL, gl);
>+	BUG();
>+}
>+
> /**
>  * relaxed_state_ok - is a requested lock compatible with the current lock mode?
>  * @actual: the current state of the lock
>@@ -672,6 +682,8 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state)
> 	if (test_and_set_bit(GLF_DEMOTE, &gl->gl_flags) == 0) {
> 		gl->gl_demote_state = state;
> 		gl->gl_demote_time = jiffies;
>+		gl->gl_demoter = (unsigned long)__builtin_return_address(0);
>+		gl->gl_demote_task = current;
> 	} else if (gl->gl_demote_state != LM_ST_UNLOCKED) {
> 		gl->gl_demote_state = state;
> 	}
>@@ -865,8 +877,10 @@ static void drop_bh(struct gfs2_glock *gl, unsigned int ret)
> 	gl->gl_req_bh = NULL;
> 	clear_bit(GLF_LOCK, &gl->gl_flags);
> 	run_queue(gl);
>+	if (!list_empty(&gl->gl_le.le_list)) {
>+		glock_in_wrong_state(gl, "drop_bh");
>+	}
> 	spin_unlock(&gl->gl_spin);
>-
> 	gfs2_glock_put(gl);
> 
> 	if (gh)
>diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
>index 11477ca..9eb77d1 100644
>--- a/fs/gfs2/glock.h
>+++ b/fs/gfs2/glock.h
>@@ -139,5 +139,6 @@ int gfs2_create_debugfs_file(struct gfs2_sbd *sdp);
> void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp);
> int gfs2_register_debugfs(void);
> void gfs2_unregister_debugfs(void);
>+void glock_in_wrong_state(struct gfs2_glock *gl, const char *msg);
> 
> #endif /* __GLOCK_DOT_H__ */
>diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
>index fdf0470..49fa3b7 100644
>--- a/fs/gfs2/incore.h
>+++ b/fs/gfs2/incore.h
>@@ -155,6 +155,8 @@ struct gfs2_glock {
> 	unsigned int gl_hash;
> 	unsigned int gl_demote_state; /* state requested by remote node */
> 	unsigned long gl_demote_time; /* time of first demote request */
>+	unsigned long gl_demoter; /* caller of demote */
>+	struct task_struct *gl_demote_task; /* ditto */
> 	pid_t gl_owner_pid;
> 	unsigned long gl_ip;
> 	struct list_head gl_holders;
>diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
>index f82d84d..fcd783e 100644
>--- a/fs/gfs2/lops.c
>+++ b/fs/gfs2/lops.c
>@@ -59,7 +59,9 @@ static void glock_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
> 		list_del_init(&gl->gl_le.le_list);
> 		sdp->sd_log_num_gl--;
> 
>-		gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(gl));
>+		if (!gfs2_glock_is_held_excl(gl)) {
>+			glock_in_wrong_state(gl, "glock_lo_after_commit");
>+		}
> 		gfs2_glock_put(gl);
> 	}
> 	gfs2_assert_warn(sdp, !sdp->sd_log_num_gl);

Actions: View | Diff

Attachments on bug 231910: 150247 | 151413 | 153557 | 154134