summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/glock.c6
-rw-r--r--fs/gfs2/glock.h2
-rw-r--r--fs/gfs2/util.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 2f790fe90f3b..ac9e10a41f00 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 e84ef6c6164d..55d5985f32a0 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 4f1db097212a..09fcfc04769b 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);