diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmast.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmast.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c index 8d17d28ef91c..355593dd8ef8 100644 --- a/fs/ocfs2/dlm/dlmast.c +++ b/fs/ocfs2/dlm/dlmast.c | |||
@@ -307,8 +307,11 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data) | |||
307 | 307 | ||
308 | if (past->type != DLM_AST && | 308 | if (past->type != DLM_AST && |
309 | past->type != DLM_BAST) { | 309 | past->type != DLM_BAST) { |
310 | mlog(ML_ERROR, "Unknown ast type! %d, cookie=%"MLFu64", " | 310 | mlog(ML_ERROR, "Unknown ast type! %d, cookie=%u:%llu" |
311 | "name=%.*s\n", past->type, cookie, locklen, name); | 311 | "name=%.*s\n", past->type, |
312 | dlm_get_lock_cookie_node(cookie), | ||
313 | dlm_get_lock_cookie_seq(cookie), | ||
314 | locklen, name); | ||
312 | ret = DLM_IVLOCKID; | 315 | ret = DLM_IVLOCKID; |
313 | goto leave; | 316 | goto leave; |
314 | } | 317 | } |
@@ -316,9 +319,11 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data) | |||
316 | res = dlm_lookup_lockres(dlm, name, locklen); | 319 | res = dlm_lookup_lockres(dlm, name, locklen); |
317 | if (!res) { | 320 | if (!res) { |
318 | mlog(ML_ERROR, "got %sast for unknown lockres! " | 321 | mlog(ML_ERROR, "got %sast for unknown lockres! " |
319 | "cookie=%"MLFu64", name=%.*s, namelen=%u\n", | 322 | "cookie=%u:%llu, name=%.*s, namelen=%u\n", |
320 | past->type == DLM_AST ? "" : "b", | 323 | past->type == DLM_AST ? "" : "b", |
321 | cookie, locklen, name, locklen); | 324 | dlm_get_lock_cookie_node(cookie), |
325 | dlm_get_lock_cookie_seq(cookie), | ||
326 | locklen, name, locklen); | ||
322 | ret = DLM_IVLOCKID; | 327 | ret = DLM_IVLOCKID; |
323 | goto leave; | 328 | goto leave; |
324 | } | 329 | } |
@@ -360,9 +365,12 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data) | |||
360 | goto do_ast; | 365 | goto do_ast; |
361 | } | 366 | } |
362 | 367 | ||
363 | mlog(ML_ERROR, "got %sast for unknown lock! cookie=%"MLFu64", " | 368 | mlog(ML_ERROR, "got %sast for unknown lock! cookie=%u:%llu, " |
364 | "name=%.*s, namelen=%u\n", | 369 | "name=%.*s, namelen=%u\n", |
365 | past->type == DLM_AST ? "" : "b", cookie, locklen, name, locklen); | 370 | past->type == DLM_AST ? "" : "b", |
371 | dlm_get_lock_cookie_node(cookie), | ||
372 | dlm_get_lock_cookie_seq(cookie), | ||
373 | locklen, name, locklen); | ||
366 | 374 | ||
367 | ret = DLM_NORMAL; | 375 | ret = DLM_NORMAL; |
368 | unlock_out: | 376 | unlock_out: |