diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmconvert.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmconvert.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/fs/ocfs2/dlm/dlmconvert.c b/fs/ocfs2/dlm/dlmconvert.c index 42c177444850..370f23c385f1 100644 --- a/fs/ocfs2/dlm/dlmconvert.c +++ b/fs/ocfs2/dlm/dlmconvert.c | |||
@@ -479,25 +479,14 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data) | |||
479 | } | 479 | } |
480 | lock = NULL; | 480 | lock = NULL; |
481 | } | 481 | } |
482 | if (!lock) { | ||
483 | __dlm_print_one_lock_resource(res); | ||
484 | list_for_each(iter, &res->granted) { | ||
485 | lock = list_entry(iter, struct dlm_lock, list); | ||
486 | if (lock->ml.node == cnv->node_idx) { | ||
487 | mlog(ML_ERROR, "There is something here " | ||
488 | "for node %u, lock->ml.cookie=%llu, " | ||
489 | "cnv->cookie=%llu\n", cnv->node_idx, | ||
490 | (unsigned long long)lock->ml.cookie, | ||
491 | (unsigned long long)cnv->cookie); | ||
492 | break; | ||
493 | } | ||
494 | } | ||
495 | lock = NULL; | ||
496 | } | ||
497 | spin_unlock(&res->spinlock); | 482 | spin_unlock(&res->spinlock); |
498 | if (!lock) { | 483 | if (!lock) { |
499 | status = DLM_IVLOCKID; | 484 | status = DLM_IVLOCKID; |
500 | dlm_error(status); | 485 | mlog(ML_ERROR, "did not find lock to convert on grant queue! " |
486 | "cookie=%u:%llu\n", | ||
487 | dlm_get_lock_cookie_node(cnv->cookie), | ||
488 | dlm_get_lock_cookie_seq(cnv->cookie)); | ||
489 | __dlm_print_one_lock_resource(res); | ||
501 | goto leave; | 490 | goto leave; |
502 | } | 491 | } |
503 | 492 | ||
@@ -537,12 +526,7 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data) | |||
537 | } | 526 | } |
538 | 527 | ||
539 | leave: | 528 | leave: |
540 | if (!lock) | 529 | if (lock) |
541 | mlog(ML_ERROR, "did not find lock to convert on grant queue! " | ||
542 | "cookie=%u:%llu\n", | ||
543 | dlm_get_lock_cookie_node(cnv->cookie), | ||
544 | dlm_get_lock_cookie_seq(cnv->cookie)); | ||
545 | else | ||
546 | dlm_lock_put(lock); | 530 | dlm_lock_put(lock); |
547 | 531 | ||
548 | /* either queue the ast or release it, if reserved */ | 532 | /* either queue the ast or release it, if reserved */ |