Commit 4abb6ad9 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: inline __gfs2_glock_schedule_for_reclaim 



Since function gfs2_glock_schedule_for_reclaim is only two
significant lines, we can eliminate it, simplifying the code
and making it more readable.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 8e711e10

fs/gfs2/glock.c

+3 −16
Original line number Diff line number Diff line
@@ -185,20 +185,6 @@ static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl) 
	spin_unlock(&lru_lock);

}



/**

 * __gfs2_glock_schedule_for_reclaim - Add a glock to the reclaim list

 * @gl: the glock

 *

 * If the glock is demotable, then we add it (or move it) to the end

 * of the glock LRU list.

 */



static void __gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl)

{

	if (demote_ok(gl))

		gfs2_glock_add_to_lru(gl);

}



/**

 * gfs2_glock_put_nolock() - Decrement reference count on glock

 * @gl: The glock to put
@@ -1121,8 +1107,9 @@ void gfs2_glock_dq(struct gfs2_holder *gh) 
		    !test_bit(GLF_DEMOTE, &gl->gl_flags))

			fast_path = 1;

	}

	if (!test_bit(GLF_LFLUSH, &gl->gl_flags))

		__gfs2_glock_schedule_for_reclaim(gl);

	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl))

		gfs2_glock_add_to_lru(gl);



	trace_gfs2_glock_queue(gh, 0);

	spin_unlock(&gl->gl_spin);

	if (likely(fast_path))

CRA Git | Maintained and supported by SUSTech CRA and CCSE