X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmgc%2Fmgc_request.c;h=cd77628cb93eca6a4d01ecb03e1f1037f1125661;hp=e024b9de97e8e5970e6f970a4312e2004c72a71f;hb=a1052417b78bc18898161c4ed44d79de4a1a2f23;hpb=7cd460776da349643f53cda4c5d4e927316b666e diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index e024b9d..cd77628 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -813,14 +813,14 @@ static int mgc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, LDLM_DEBUG(lock, "MGC blocking CB"); ldlm_lock2handle(lock, &lockh); rc = ldlm_cli_cancel(&lockh, LCF_ASYNC); - break; - case LDLM_CB_CANCELING: - /* We've given up the lock, prepare ourselves to update. */ - LDLM_DEBUG(lock, "MGC cancel CB"); + break; + case LDLM_CB_CANCELING: + /* We've given up the lock, prepare ourselves to update. */ + LDLM_DEBUG(lock, "MGC cancel CB"); - CDEBUG(D_MGC, "Lock res "LPX64" (%.8s)\n", - lock->l_resource->lr_name.name[0], - (char *)&lock->l_resource->lr_name.name[0]); + CDEBUG(D_MGC, "Lock res "DLDLMRES" (%.8s)\n", + PLDLMRES(lock->l_resource), + (char *)&lock->l_resource->lr_name.name[0]); if (!cld) { CDEBUG(D_INFO, "missing data, won't requeue\n");