Commit 473678cc authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Rename gfs2_{gl_dq_holders => withdraw_glocks} 



Rename function gfs2_gl_dq_holders() to gfs2_withdraw_glocks().  This
function will soon be used for more than just dequeuing holders.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 655531c9

fs/gfs2/glock.c

+3 −3
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ static void dump_glock_func(struct gfs2_glock *gl) 
	dump_glock(NULL, gl, true);

}



static void withdraw_dq(struct gfs2_glock *gl)

static void withdraw_glock(struct gfs2_glock *gl)

{

	spin_lock(&gl->gl_lockref.lock);

	if (!__lockref_is_dead(&gl->gl_lockref))
@@ -2086,9 +2086,9 @@ static void withdraw_dq(struct gfs2_glock *gl) 
	spin_unlock(&gl->gl_lockref.lock);

}



void gfs2_gl_dq_holders(struct gfs2_sbd *sdp)

void gfs2_withdraw_glocks(struct gfs2_sbd *sdp)

{

	glock_hash_walk(withdraw_dq, sdp);

	glock_hash_walk(withdraw_glock, sdp);

}



/**

fs/gfs2/glock.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later); 
void gfs2_cancel_delete_work(struct gfs2_glock *gl);

void gfs2_flush_delete_work(struct gfs2_sbd *sdp);

void gfs2_gl_hash_clear(struct gfs2_sbd *sdp);

void gfs2_gl_dq_holders(struct gfs2_sbd *sdp);

void gfs2_withdraw_glocks(struct gfs2_sbd *sdp);

void gfs2_glock_thaw(struct gfs2_sbd *sdp);

void gfs2_glock_free(struct gfs2_glock *gl);

void gfs2_glock_free_later(struct gfs2_glock *gl);

fs/gfs2/util.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void do_withdraw(struct gfs2_sbd *sdp) 
		 * Dequeue any pending non-system glock holders that can no

		 * longer be granted because the file system is withdrawn.

		 */

		gfs2_gl_dq_holders(sdp);

		gfs2_withdraw_glocks(sdp);

	}



	gfs2_thaw_freeze_initiator(sdp->sd_vfs);