dlm: move to rinfo for all middle conversion cases

Since commit f74dacb4c8116 ("dlm: fix recovery of middle conversions")
we introduced additional debugging information if we hit the middle
conversion by using log_limit(). The DLM log_limit() functionality
requires a DLM debug option being enabled. As this case is so rarely and
excempt any potential introduced new issue with recovery we switching it
to log_rinfo() ad this is ratelimited under normal DLM loglevel.

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

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 6dd3a524cd3529480b785dcc1e321b64aba4f607..be938fdf17d9670f5c923db7320ae8c3a3123174 100644 (file)
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -5576,7 +5576,7 @@ static int receive_rcom_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
 
        if (rl->rl_status == DLM_LKSTS_CONVERT && middle_conversion(lkb)) {
                /* We may need to adjust grmode depending on other granted locks. */
-               log_limit(ls, "%s %x middle convert gr %d rq %d remote %d %x",
+               log_rinfo(ls, "%s %x middle convert gr %d rq %d remote %d %x",
                          __func__, lkb->lkb_id, lkb->lkb_grmode,
                          lkb->lkb_rqmode, lkb->lkb_nodeid, lkb->lkb_remid);
                rsb_set_flag(r, RSB_RECOVER_CONVERT);

diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index be4240f09abd42dea44d1aa0681ccc853d68615e..3ac020fb8139eab22451be403830d6c7ab73c920 100644 (file)
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -842,7 +842,7 @@ static void recover_conversion(struct dlm_rsb *r)
                 */
                if (((lkb->lkb_grmode == DLM_LOCK_PR) && (other_grmode == DLM_LOCK_CW)) ||
                    ((lkb->lkb_grmode == DLM_LOCK_CW) && (other_grmode == DLM_LOCK_PR))) {
-                       log_limit(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL",
+                       log_rinfo(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL",
                                  __func__, lkb->lkb_id, lkb->lkb_grmode,
                                  lkb->lkb_rqmode, lkb->lkb_nodeid,
                                  lkb->lkb_remid, other_lkid, other_grmode);