Commit 81e1d450 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: Combine functions gfs2_glock_dq_wait and wait_on_demote 



Function gfs2_glock_dq_wait called two-line function wait_on_demote,
so they were combined.

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

fs/gfs2/glock.c

+2 −7
Original line number Diff line number Diff line
@@ -890,12 +890,6 @@ int gfs2_glock_wait(struct gfs2_holder *gh) 
	return gh->gh_error;

}



static void wait_on_demote(struct gfs2_glock *gl)

{

	might_sleep();

	wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE);

}



/**

 * handle_callback - process a demote request

 * @gl: the glock
@@ -1123,7 +1117,8 @@ void gfs2_glock_dq_wait(struct gfs2_holder *gh) 
{

	struct gfs2_glock *gl = gh->gh_gl;

	gfs2_glock_dq(gh);

	wait_on_demote(gl);

	might_sleep();

	wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE);

}



/**