gfs2: Rename gfs2_{gl_dq_holders => withdraw_glocks}

Andreas Gruenbacher · Andreas Gruenbacher · commit 473678ccb97d · 2025-11-26T23:52:27.000Z
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: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
@@ -2078,17 +2078,17 @@ 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))
 		do_error(gl, LM_OUT_ERROR); /* remove pending waiters */
 	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);
 }
 
 /**
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
@@ -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);
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2078,17 +2078,17 @@ static void dump_glock_func(struct gfs2_glock *gl)`
`2078`	`2078`	`dump_glock(NULL, gl, true);`
`2079`	`2079`	`}`
`2080`	`2080`
`2081`		`-static void withdraw_dq(struct gfs2_glock *gl)`
	`2081`	`+static void withdraw_glock(struct gfs2_glock *gl)`
`2082`	`2082`	`{`
`2083`	`2083`	`spin_lock(&gl->gl_lockref.lock);`
`2084`	`2084`	`if (!__lockref_is_dead(&gl->gl_lockref))`
`2085`	`2085`	`do_error(gl, LM_OUT_ERROR); /* remove pending waiters */`
`2086`	`2086`	`spin_unlock(&gl->gl_lockref.lock);`
`2087`	`2087`	`}`
`2088`	`2088`
`2089`		`-void gfs2_gl_dq_holders(struct gfs2_sbd *sdp)`
	`2089`	`+void gfs2_withdraw_glocks(struct gfs2_sbd *sdp)`
`2090`	`2090`	`{`
`2091`		`- glock_hash_walk(withdraw_dq, sdp);`
	`2091`	`+ glock_hash_walk(withdraw_glock, sdp);`
`2092`	`2092`	`}`
`2093`	`2093`
`2094`	`2094`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ static void do_withdraw(struct gfs2_sbd *sdp)`
`149`	`149`	`* Dequeue any pending non-system glock holders that can no`
`150`	`150`	`* longer be granted because the file system is withdrawn.`
`151`	`151`	`*/`
`152`		`- gfs2_gl_dq_holders(sdp);`
	`152`	`+ gfs2_withdraw_glocks(sdp);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`gfs2_thaw_freeze_initiator(sdp->sd_vfs);`