Commit cd493dcf authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: run_queue cleanup 



Transform the code in run_queue() to make it more readable.  No change
in functionality.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarAndrew Price <anprice@redhat.com>
parent 20453644

fs/gfs2/glock.c

+19 −16
Original line number Diff line number Diff line
@@ -835,8 +835,12 @@ __acquires(&gl->gl_lockref.lock) 
	/* While a demote is in progress, the GLF_LOCK flag must be set. */

	GLOCK_BUG_ON(gl, test_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags));



	if (test_bit(GLF_DEMOTE, &gl->gl_flags) &&

	    gl->gl_demote_state != gl->gl_state) {

	if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {

		if (gl->gl_demote_state == gl->gl_state) {

			gfs2_demote_wake(gl);

			goto promote;

		}



		if (find_first_holder(gl))

			goto out_unlock;

		if (nonblock)
@@ -846,9 +850,9 @@ __acquires(&gl->gl_lockref.lock) 
		gl->gl_target = gl->gl_demote_state;

		do_xmote(gl, NULL, gl->gl_target);

		return;

	} else {

		if (test_bit(GLF_DEMOTE, &gl->gl_flags))

			gfs2_demote_wake(gl);

	}



promote:

	do_promote(gl);

	if (find_first_holder(gl))

		goto out_unlock;
@@ -860,7 +864,6 @@ __acquires(&gl->gl_lockref.lock) 
		do_error(gl, 0); /* Fail queued try locks */

	do_xmote(gl, gh, gl->gl_target);

	return;

	}



out_sched:

	clear_bit(GLF_LOCK, &gl->gl_flags);