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 <agruenba@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 34af0e7db98ba46ff73712aaa10fe2dbe6e62b7d..bac7078e48704193c216876507a3632644b4f9b3 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1641,7 +1641,7 @@ unlock:
        spin_lock(&gl->gl_lockref.lock);
        add_to_queue(gh);
        if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
-                    test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
+                    test_and_clear_bit(GLF_HAVE_FROZEN_REPLY, &gl->gl_flags))) {
                set_bit(GLF_HAVE_REPLY, &gl->gl_flags);
                gl->gl_lockref.count++;
                gfs2_glock_queue_work(gl, 0);
@@ -1986,7 +1986,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
 
        if (unlikely(test_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags))) {
                if (gfs2_should_freeze(gl)) {
-                       set_bit(GLF_FROZEN, &gl->gl_flags);
+                       set_bit(GLF_HAVE_FROZEN_REPLY, &gl->gl_flags);
                        spin_unlock(&gl->gl_lockref.lock);
                        return;
                }
@@ -2180,7 +2180,7 @@ void gfs2_flush_delete_work(struct gfs2_sbd *sdp)
 
 static void thaw_glock(struct gfs2_glock *gl)
 {
-       if (!test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))
+       if (!test_and_clear_bit(GLF_HAVE_FROZEN_REPLY, &gl->gl_flags))
                return;
        if (!lockref_get_not_dead(&gl->gl_lockref))
                return;
@@ -2368,7 +2368,7 @@ static const char *gflags2str(char *buf, const struct gfs2_glock *gl)
                *p++ = 'r';
        if (test_bit(GLF_INITIAL, gflags))
                *p++ = 'I';
-       if (test_bit(GLF_FROZEN, gflags))
+       if (test_bit(GLF_HAVE_FROZEN_REPLY, gflags))
                *p++ = 'F';
        if (!list_empty(&gl->gl_holders))
                *p++ = 'q';

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index e4423075433b67f7524532713ae682d35efe54a6..73f24b86338cac8a90edb2e966ea6b04687ea176 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -324,7 +324,7 @@ enum {
        GLF_INVALIDATE_IN_PROGRESS      = 8,
        GLF_HAVE_REPLY                  = 9,
        GLF_INITIAL                     = 10,
-       GLF_FROZEN                      = 11,
+       GLF_HAVE_FROZEN_REPLY           = 11,
        GLF_INSTANTIATE_IN_PROG         = 12, /* instantiate happening now */
        GLF_LRU                         = 13,
        GLF_OBJECT                      = 14, /* Used only for tracing */

diff --git a/fs/gfs2/trace_gfs2.h b/fs/gfs2/trace_gfs2.h
index 3721f0333dd724f907c8d9bbaeb69c1ae51bcf8d..65748bfaef694fbbc4b70a89428a63fe5cdf15e4 100644 (file)
--- a/fs/gfs2/trace_gfs2.h
+++ b/fs/gfs2/trace_gfs2.h
@@ -55,7 +55,7 @@
        {(1UL << GLF_INVALIDATE_IN_PROGRESS),   "i" },          \
        {(1UL << GLF_HAVE_REPLY),               "r" },          \
        {(1UL << GLF_INITIAL),                  "I" },          \
-       {(1UL << GLF_FROZEN),                   "F" },          \
+       {(1UL << GLF_HAVE_FROZEN_REPLY),        "F" },          \
        {(1UL << GLF_LRU),                      "L" },          \
        {(1UL << GLF_OBJECT),                   "o" },          \
        {(1UL << GLF_BLOCKING),                 "b" })