Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e589665e authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Remove flags no longer required 



The HIF_MUTEX and HIF_PROMOTE flags were set on the glock holders
depending upon which of the two waiters lists they were going to
be queued upon. They were then tested when the holders were taken
off the lists to ensure that the right type of holder was being
dequeued.

Since we are already using separate lists, there doesn't seem a
lot of point having these flags as well, and since setting them
and testing them is in the fast path for locking and unlocking
glock, this patch removes them.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 3042a2cc

fs/gfs2/glock.c

+2 −15
Original line number Diff line number Diff line
@@ -594,12 +594,7 @@ static void run_queue(struct gfs2_glock *gl) 
		if (!list_empty(&gl->gl_waiters1)) {

			gh = list_entry(gl->gl_waiters1.next,

					struct gfs2_holder, gh_list);



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

			blocked = rq_mutex(gh);

			else

				gfs2_assert_warn(gl->gl_sbd, 0);



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

			blocked = rq_demote(gl);

			if (gl->gl_waiters2 && !blocked) {
@@ -610,12 +605,7 @@ static void run_queue(struct gfs2_glock *gl) 
		} else if (!list_empty(&gl->gl_waiters3)) {

			gh = list_entry(gl->gl_waiters3.next,

					struct gfs2_holder, gh_list);



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

			blocked = rq_promote(gh);

			else

				gfs2_assert_warn(gl->gl_sbd, 0);



		} else

			break;
@@ -636,7 +626,6 @@ static void gfs2_glmutex_lock(struct gfs2_glock *gl) 
	struct gfs2_holder gh;



	gfs2_holder_init(gl, 0, 0, &gh);

	set_bit(HIF_MUTEX, &gh.gh_iflags);

	if (test_and_set_bit(HIF_WAIT, &gh.gh_iflags))

		BUG();
@@ -1160,8 +1149,6 @@ int gfs2_glock_nq(struct gfs2_holder *gh) 
		return -EIO;

	}



	set_bit(HIF_PROMOTE, &gh->gh_iflags);



	spin_lock(&gl->gl_spin);

	add_to_queue(gh);

	run_queue(gl);

fs/gfs2/incore.h

+0 −4
Original line number Diff line number Diff line
@@ -141,10 +141,6 @@ struct gfs2_glock_operations { 
};



enum {

	/* Actions */

	HIF_MUTEX		= 0,

	HIF_PROMOTE		= 1,



	/* States */

	HIF_HOLDER		= 6,

	HIF_FIRST		= 7,