Skip to content

Commit 1fb5f67

Browse files
author
Andreas Gruenbacher
committed
gfs2: Rename GLF_FROZEN to GLF_HAVE_FROZEN_REPLY
The GLF_FROZEN flag indicates that a reply to a DLM locking request has been received, but should not be processed at this time. To clarify that meaning, rename the flag to GLF_HAVE_FROZEN_REPLY. Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 0a0383a commit 1fb5f67

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

fs/gfs2/glock.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,7 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
16411641
spin_lock(&gl->gl_lockref.lock);
16421642
add_to_queue(gh);
16431643
if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
1644-
test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
1644+
test_and_clear_bit(GLF_HAVE_FROZEN_REPLY, &gl->gl_flags))) {
16451645
set_bit(GLF_HAVE_REPLY, &gl->gl_flags);
16461646
gl->gl_lockref.count++;
16471647
gfs2_glock_queue_work(gl, 0);
@@ -1986,7 +1986,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
19861986

19871987
if (unlikely(test_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags))) {
19881988
if (gfs2_should_freeze(gl)) {
1989-
set_bit(GLF_FROZEN, &gl->gl_flags);
1989+
set_bit(GLF_HAVE_FROZEN_REPLY, &gl->gl_flags);
19901990
spin_unlock(&gl->gl_lockref.lock);
19911991
return;
19921992
}
@@ -2180,7 +2180,7 @@ void gfs2_flush_delete_work(struct gfs2_sbd *sdp)
21802180

21812181
static void thaw_glock(struct gfs2_glock *gl)
21822182
{
2183-
if (!test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))
2183+
if (!test_and_clear_bit(GLF_HAVE_FROZEN_REPLY, &gl->gl_flags))
21842184
return;
21852185
if (!lockref_get_not_dead(&gl->gl_lockref))
21862186
return;
@@ -2368,7 +2368,7 @@ static const char *gflags2str(char *buf, const struct gfs2_glock *gl)
23682368
*p++ = 'r';
23692369
if (test_bit(GLF_INITIAL, gflags))
23702370
*p++ = 'I';
2371-
if (test_bit(GLF_FROZEN, gflags))
2371+
if (test_bit(GLF_HAVE_FROZEN_REPLY, gflags))
23722372
*p++ = 'F';
23732373
if (!list_empty(&gl->gl_holders))
23742374
*p++ = 'q';

fs/gfs2/incore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ enum {
324324
GLF_INVALIDATE_IN_PROGRESS = 8,
325325
GLF_HAVE_REPLY = 9,
326326
GLF_INITIAL = 10,
327-
GLF_FROZEN = 11,
327+
GLF_HAVE_FROZEN_REPLY = 11,
328328
GLF_INSTANTIATE_IN_PROG = 12, /* instantiate happening now */
329329
GLF_LRU = 13,
330330
GLF_OBJECT = 14, /* Used only for tracing */

fs/gfs2/trace_gfs2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{(1UL << GLF_INVALIDATE_IN_PROGRESS), "i" }, \
5656
{(1UL << GLF_HAVE_REPLY), "r" }, \
5757
{(1UL << GLF_INITIAL), "I" }, \
58-
{(1UL << GLF_FROZEN), "F" }, \
58+
{(1UL << GLF_HAVE_FROZEN_REPLY), "F" }, \
5959
{(1UL << GLF_LRU), "L" }, \
6060
{(1UL << GLF_OBJECT), "o" }, \
6161
{(1UL << GLF_BLOCKING), "b" })

0 commit comments

Comments
 (0)