Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alexander Aring and committed by
David Teigland
a8abcff1 452d90de

+2 -2
+1 -1
fs/dlm/lock.c
··· 5576 5576 5577 5577 if (rl->rl_status == DLM_LKSTS_CONVERT && middle_conversion(lkb)) { 5578 5578 /* We may need to adjust grmode depending on other granted locks. */ 5579 - log_limit(ls, "%s %x middle convert gr %d rq %d remote %d %x", 5579 + log_rinfo(ls, "%s %x middle convert gr %d rq %d remote %d %x", 5580 5580 __func__, lkb->lkb_id, lkb->lkb_grmode, 5581 5581 lkb->lkb_rqmode, lkb->lkb_nodeid, lkb->lkb_remid); 5582 5582 rsb_set_flag(r, RSB_RECOVER_CONVERT);
+1 -1
fs/dlm/recover.c
··· 842 842 */ 843 843 if (((lkb->lkb_grmode == DLM_LOCK_PR) && (other_grmode == DLM_LOCK_CW)) || 844 844 ((lkb->lkb_grmode == DLM_LOCK_CW) && (other_grmode == DLM_LOCK_PR))) { 845 - log_limit(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL", 845 + log_rinfo(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL", 846 846 __func__, lkb->lkb_id, lkb->lkb_grmode, 847 847 lkb->lkb_rqmode, lkb->lkb_nodeid, 848 848 lkb->lkb_remid, other_lkid, other_grmode);