From 1831014c240fd776e3c7bbb7fe9a5271f641b79d Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Wed, 23 Aug 2017 18:15:14 -0500 Subject: [PATCH] scoutfs: remove usage of ocfs2_lock_type_string() This only leaked into the bast function. I retained the debug print - it'll be turned off in our build anyway, and that's what we'd want to do upstream. Signed-off-by: Mark Fasheh --- kmod/src/dlmglue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kmod/src/dlmglue.c b/kmod/src/dlmglue.c index c217592d..1e44b0c9 100644 --- a/kmod/src/dlmglue.c +++ b/kmod/src/dlmglue.c @@ -1119,9 +1119,13 @@ static void ocfs2_blocking_ast(struct ocfs2_dlm_lksb *lksb, int level) BUG_ON(level <= DLM_LOCK_NL); +#if 0 mlog(ML_BASTS, "BAST fired for lockres %s, blocking %d, level %d, " "type %s\n", lockres->l_name, level, lockres->l_level, ocfs2_lock_type_string(lockres->l_type)); +#endif + mlog(ML_BASTS, "BAST fired for lockres %s, blocking %d, level %d\n", + lockres->l_name, level, lockres->l_level); /* * We can skip the bast for locks which don't enable caching -