LU-6245 client: remove types abstraction from client code

[fs/lustre-release.git] / lustre / obdclass / debug.c

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index 41331c8..5edc4b5 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -48,7 +48,7 @@
 void dump_lniobuf(struct niobuf_local *nb)
 {
        CDEBUG(D_RPCTRACE,
-              "niobuf_local: file_offset="LPD64", len=%d, page=%p, rc=%d\n",
+              "niobuf_local: file_offset=%lld, len=%d, page=%p, rc=%d\n",
               nb->lnb_file_offset, nb->lnb_len, nb->lnb_page, nb->lnb_rc);
        CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n",
               nb->lnb_page ? page_index(nb->lnb_page) : -1);
@@ -82,25 +82,25 @@ int block_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
         ne_off = le64_to_cpu (off);
         id = le64_to_cpu (id);
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" off: "LPX64" != "
-                       LPX64"\n", who, id, off, *(__u64 *)addr, ne_off);
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu off: %#llx != "
+                      "%#llx\n", who, id, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" id: "LPX64" != "LPX64"\n",
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu id: %#llx != %#llx\n",
                        who, id, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }
 
         addr += end - LPDS - LPDS;
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" end off: "LPX64" != "
-                       LPX64"\n", who, id, off, *(__u64 *)addr, ne_off);
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu end off: %#llx != "
+                      "%#llx\n", who, id, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" end id: "LPX64" != "
-                       LPX64"\n", who, id, off, *(__u64 *)(addr + LPDS), id);
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu end id: %#llx != "
+                      "%#llx\n", who, id, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }