From 114760365c6517c1b83a3150fd6499162af0aa9e Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Wed, 23 Aug 2017 18:57:41 -0500 Subject: [PATCH] scoutfs: fix up ocfs2_log_dlm_error() We're still referencing some ocfs2 specific lock names here, take them out. Signed-off-by: Mark Fasheh --- kmod/src/dlmglue.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kmod/src/dlmglue.c b/kmod/src/dlmglue.c index 3b9519df..6c0e0d7b 100644 --- a/kmod/src/dlmglue.c +++ b/kmod/src/dlmglue.c @@ -404,9 +404,8 @@ static inline void ocfs2_recover_from_dlm_error(struct ocfs2_lock_res *lockres, } while (0) #endif #define ocfs2_log_dlm_error(_func, _err, _lockres) do { \ - mlog(ML_ERROR, "DLM error %d while calling %s on resource %.*s%08x\n", \ - _err, _func, OCFS2_DENTRY_LOCK_INO_START - 1, (_lockres)->l_name, \ - (unsigned int)ocfs2_get_dentry_lock_ino(_lockres)); \ + mlog(ML_ERROR, "DLM error %d while calling %s on resource %s\n", \ + _err, _func, (_lockres)->l_name); \ } while (0) static int ocfs2_downconvert_thread(void *arg);