LU-2901 ldlm: fix resource/fid check, use DLDLMRES

[fs/lustre-release.git] / lustre / mgc / mgc_request.c

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index e024b9d..cd77628 100644 (file)
--- 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);
                 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");
 
                 if (!cld) {
                         CDEBUG(D_INFO, "missing data, won't requeue\n");