From 473678ccb97dabeebc802d01a7f5c80e3a82b04c Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Tue, 12 Aug 2025 14:48:28 +0200 Subject: [PATCH] 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: Andreas Gruenbacher --- fs/gfs2/glock.c | 6 +++--- fs/gfs2/glock.h | 2 +- fs/gfs2/util.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 2f790fe90f3b3..ac9e10a41f00f 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -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); } /** diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h index e84ef6c6164dd..55d5985f32a08 100644 --- 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 index 4f1db097212a8..09fcfc04769b4 100644 --- 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); -- 2.47.3