fs: dlm: make dlm_callback_resume quite

This patch makes dlm_callback_resume info printout less noisy by
accumulate all callback queues into one printout not in 25 times steps.
It seems this printout became lately quite noisy in relationship with
gfs2.

Before:

[241767.849302] dlm: bin: dlm_callback_resume 25
[241767.854846] dlm: bin: dlm_callback_resume 25
[241767.860373] dlm: bin: dlm_callback_resume 25
...
[241767.865920] dlm: bin: dlm_callback_resume 25
[241767.871352] dlm: bin: dlm_callback_resume 25
[241767.876733] dlm: bin: dlm_callback_resume 25

After the patch:

[  385.485728] dlm: gfs2: dlm_callback_resume 175

if zero it will not be printed out.

Reported-by: Barry Marson <bmarson@redhat.com>
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c
index 283c7b94eddadeb7b88e7c84ff6c09a9db5c3e0a..6600930497ccc67d67dea780eae6be3c082ae27b 100644 (file)
--- a/fs/dlm/ast.c
+++ b/fs/dlm/ast.c
@@ -295,7 +295,7 @@ void dlm_callback_suspend(struct dlm_ls *ls)
 void dlm_callback_resume(struct dlm_ls *ls)
 {
        struct dlm_lkb *lkb, *safe;
-       int count = 0;
+       int count = 0, sum = 0;
 
        clear_bit(LSFL_CB_DELAY, &ls->ls_flags);
 
@@ -313,12 +313,14 @@ more:
        }
        mutex_unlock(&ls->ls_cb_mutex);
 
-       if (count)
-               log_rinfo(ls, "dlm_callback_resume %d", count);
+       sum += count;
        if (count == MAX_CB_QUEUE) {
                count = 0;
                cond_resched();
                goto more;
        }
+
+       if (sum)
+               log_rinfo(ls, "%s %d", __func__, sum);
 }