[GFS2] Fix runtime issue with UP kernels (1a2781cf) · Commits · 戴 / test

The issue is indeed UP vs SMP and it is totally random. spin_is_locked() is a bad assertion because there is no correct answer on UP. on UP spin_is_locked() has to return either one value or another, always. This means that in my setup I am lucky enough to trigger the issue and your you are lucky enough not to. the patch in attachment removes the bogus calls to BUG_ON and according to David (in CC and thanks for the long explanation on the problem) we can rely upon things like lockdep to find problem that might be trying to catch. Signed-off-by:

Fabio M. Di Nitto <fabbione@ubuntu.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by:

Steven Whitehouse <swhiteho@redhat.com>

fs/gfs2/glock.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -217,7 +217,6 @@ int gfs2_glock_put(struct gfs2_glock *gl)
		if (atomic_dec_and_test(&gl->gl_ref)) {
		hlist_del(&gl->gl_list);
		write_unlock(gl_lock_addr(gl->gl_hash));
		BUG_ON(spin_is_locked(&gl->gl_spin));
		gfs2_assert(sdp, gl->gl_state == LM_ST_UNLOCKED);
		gfs2_assert(sdp, list_empty(&gl->gl_reclaim));
		gfs2_assert(sdp, list_empty(&gl->gl_holders));
		@@ -460,7 +459,6 @@ static void wait_on_holder(struct gfs2_holder *gh)

		static void gfs2_demote_wake(struct gfs2_glock *gl)
		{
		BUG_ON(!spin_is_locked(&gl->gl_spin));
		gl->gl_demote_state = LM_ST_EXCLUSIVE;
		clear_bit(GLF_DEMOTE, &gl->gl_flags);
		smp_mb__after_clear_bit();
		@@ -680,7 +678,6 @@ static void gfs2_glmutex_unlock(struct gfs2_glock *gl)
		gl->gl_owner_pid = 0;
		gl->gl_ip = 0;
		run_queue(gl);
		BUG_ON(!spin_is_locked(&gl->gl_spin));
		spin_unlock(&gl->gl_spin);
		}

fs/gfs2/log.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -92,8 +92,6 @@ static void gfs2_ail1_start_one(struct gfs2_sbd sdp, struct gfs2_ail ai)
		struct buffer_head *bh;
		int retry;

		BUG_ON(!spin_is_locked(&sdp->sd_log_lock));

		do {
		retry = 0;

Admin message