Commit 60d8bae9 authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher
Browse files

gfs2: further simplify do_promote 



This patch further simplifies function do_promote by eliminating some
redundant code in favor of using a lock_released flag. This is just
prep work for a future patch.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 17a6ecee

fs/gfs2/glock.c

+23 −20
Original line number Diff line number Diff line
@@ -487,12 +487,14 @@ __acquires(&gl->gl_lockref.lock) 
	const struct gfs2_glock_operations *glops = gl->gl_ops;

	struct gfs2_holder *gh, *tmp, *first_gh;

	bool incompat_holders_demoted = false;

	bool lock_released;

	int ret;



restart:

	first_gh = find_first_strong_holder(gl);

	list_for_each_entry_safe(gh, tmp, &gl->gl_holders, gh_list) {

		if (!test_bit(HIF_WAIT, &gh->gh_iflags))

		lock_released = false;

		if (test_bit(HIF_HOLDER, &gh->gh_iflags))

			continue;

		if (!may_grant(gl, first_gh, gh)) {

			/*
@@ -511,10 +513,9 @@ __acquires(&gl->gl_lockref.lock) 
			first_gh = gh;

		}

		if (gh->gh_list.prev == &gl->gl_holders &&

		    glops->go_instantiate) {

			if (!(gh->gh_flags & GL_SKIP)) {

		    !(gh->gh_flags & GL_SKIP) && glops->go_instantiate) {

			lock_released = true;

			spin_unlock(&gl->gl_lockref.lock);

				/* FIXME: eliminate this eventually */

			ret = glops->go_instantiate(gh);

			spin_lock(&gl->gl_lockref.lock);

			if (ret) {
@@ -530,12 +531,14 @@ __acquires(&gl->gl_lockref.lock) 
		set_bit(HIF_HOLDER, &gh->gh_iflags);

		trace_gfs2_promote(gh);

		gfs2_holder_wake(gh);

		/*

		 * If we released the gl_lockref.lock the holders list may have

		 * changed. For that reason, we start again at the start of

		 * the holders queue.

		 */

		if (lock_released)

			goto restart;

	}

		set_bit(HIF_HOLDER, &gh->gh_iflags);

		trace_gfs2_promote(gh);

		gfs2_holder_wake(gh);

	}

	return 0;

}