LU-6245 client: remove types abstraction from client code

[fs/lustre-release.git] / lustre / ldlm / ldlm_extent.c

diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c
index ace668a..42c84f0 100644 (file)
--- a/lustre/ldlm/ldlm_extent.c
+++ b/lustre/ldlm/ldlm_extent.c
@@ -107,10 +107,10 @@ static void ldlm_extent_internal_policy_fixup(struct ldlm_lock *req,
         new_ex->start = ((new_ex->start - 1) | mask) + 1;
         new_ex->end = ((new_ex->end + 1) & ~mask) - 1;
         LASSERTF(new_ex->start <= req_start,
-                 "mask "LPX64" grant start "LPU64" req start "LPU64"\n",
+                "mask %#llx grant start %llu req start %llu\n",
                  mask, new_ex->start, req_start);
         LASSERTF(new_ex->end >= req_end,
-                 "mask "LPX64" grant end "LPU64" req end "LPU64"\n",
+                "mask %#llx grant end %llu req end %llu\n",
                  mask, new_ex->end, req_end);
 }
 
@@ -705,9 +705,8 @@ void ldlm_resource_prolong(struct ldlm_prolong_args *arg)
        res = ldlm_resource_get(arg->lpa_export->exp_obd->obd_namespace, NULL,
                                &arg->lpa_resid, LDLM_EXTENT, 0);
        if (IS_ERR(res)) {
-               CDEBUG(D_DLMTRACE, "Failed to get resource for resid "LPU64"/"
-                      LPU64"\n", arg->lpa_resid.name[0],
-                      arg->lpa_resid.name[1]);
+               CDEBUG(D_DLMTRACE, "Failed to get resource for resid %llu/%llu\n",
+                      arg->lpa_resid.name[0], arg->lpa_resid.name[1]);
                RETURN_EXIT;
        }
 
@@ -932,7 +931,7 @@ __u64 ldlm_extent_shift_kms(struct ldlm_lock *lock, __u64 old_kms)
                 if (lck->l_policy_data.l_extent.end + 1 > kms)
                         kms = lck->l_policy_data.l_extent.end + 1;
         }
-        LASSERTF(kms <= old_kms, "kms "LPU64" old_kms "LPU64"\n", kms, old_kms);
+       LASSERTF(kms <= old_kms, "kms %llu old_kms %llu\n", kms, old_kms);
 
         RETURN(kms);
 }