X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpack_generic.c;h=454e0e0edc6043330dd95faf3e91640b354a0d4c;hb=500f334631c6ebec72f5791472f21603da3e0ef9;hp=d91bdf15a169050765c6dce69eb6a01b9f6f117a;hpb=530b16b187de9a27723205d9d759f260bfd350b8;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index d91bdf1..454e0e0 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -2108,8 +2108,8 @@ void lustre_print_user_md(unsigned int lvl, struct lov_user_md *lum,
 	CDEBUG(lvl, "%s lov_user_md %p:\n", msg, lum);
 	CDEBUG(lvl, "\tlmm_magic: %#x\n", lum->lmm_magic);
 	CDEBUG(lvl, "\tlmm_pattern: %#x\n", lum->lmm_pattern);
-	CDEBUG(lvl, "\tlmm_object_id: "LPU64"\n", lmm_oi_id(&lum->lmm_oi));
-	CDEBUG(lvl, "\tlmm_object_gr: "LPU64"\n", lmm_oi_seq(&lum->lmm_oi));
+	CDEBUG(lvl, "\tlmm_object_id: %llu\n", lmm_oi_id(&lum->lmm_oi));
+	CDEBUG(lvl, "\tlmm_object_gr: %llu\n", lmm_oi_seq(&lum->lmm_oi));
 	CDEBUG(lvl, "\tlmm_stripe_size: %#x\n", lum->lmm_stripe_size);
 	CDEBUG(lvl, "\tlmm_stripe_count: %#x\n", lum->lmm_stripe_count);
 	CDEBUG(lvl, "\tlmm_stripe_offset/lmm_layout_gen: %#x\n",
@@ -2276,7 +2276,7 @@ void dump_ioo(struct obd_ioobj *ioo)
 
 void dump_rniobuf(struct niobuf_remote *nb)
 {
-	CDEBUG(D_RPCTRACE, "niobuf_remote: offset="LPU64", len=%d, flags=%x\n",
+	CDEBUG(D_RPCTRACE, "niobuf_remote: offset=%llu, len=%d, flags=%x\n",
 	       nb->rnb_offset, nb->rnb_len, nb->rnb_flags);
 }
 
@@ -2284,24 +2284,24 @@ void dump_obdo(struct obdo *oa)
 {
 	u64 valid = oa->o_valid;
 
-	CDEBUG(D_RPCTRACE, "obdo: o_valid = "LPX64"\n", valid);
+	CDEBUG(D_RPCTRACE, "obdo: o_valid = %#llx\n", valid);
 	if (valid & OBD_MD_FLID)
 		CDEBUG(D_RPCTRACE, "obdo: id = "DOSTID"\n", POSTID(&oa->o_oi));
 	if (valid & OBD_MD_FLFID)
-		CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = "LPX64"\n",
+		CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = %#llx\n",
 		       oa->o_parent_seq);
         if (valid & OBD_MD_FLSIZE)
-                CDEBUG(D_RPCTRACE, "obdo: o_size = "LPD64"\n", oa->o_size);
+		CDEBUG(D_RPCTRACE, "obdo: o_size = %lld\n", oa->o_size);
         if (valid & OBD_MD_FLMTIME)
-                CDEBUG(D_RPCTRACE, "obdo: o_mtime = "LPD64"\n", oa->o_mtime);
+		CDEBUG(D_RPCTRACE, "obdo: o_mtime = %lld\n", oa->o_mtime);
         if (valid & OBD_MD_FLATIME)
-                CDEBUG(D_RPCTRACE, "obdo: o_atime = "LPD64"\n", oa->o_atime);
+		CDEBUG(D_RPCTRACE, "obdo: o_atime = %lld\n", oa->o_atime);
         if (valid & OBD_MD_FLCTIME)
-                CDEBUG(D_RPCTRACE, "obdo: o_ctime = "LPD64"\n", oa->o_ctime);
+		CDEBUG(D_RPCTRACE, "obdo: o_ctime = %lld\n", oa->o_ctime);
         if (valid & OBD_MD_FLBLOCKS)   /* allocation of space */
-                CDEBUG(D_RPCTRACE, "obdo: o_blocks = "LPD64"\n", oa->o_blocks);
+		CDEBUG(D_RPCTRACE, "obdo: o_blocks = %lld\n", oa->o_blocks);
         if (valid & OBD_MD_FLGRANT)
-                CDEBUG(D_RPCTRACE, "obdo: o_grant = "LPD64"\n", oa->o_grant);
+		CDEBUG(D_RPCTRACE, "obdo: o_grant = %lld\n", oa->o_grant);
         if (valid & OBD_MD_FLBLKSZ)
                 CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize);
         if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE))
@@ -2327,7 +2327,7 @@ void dump_obdo(struct obdo *oa)
                 CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n",
                        oa->o_parent_oid);
         if (valid & OBD_MD_FLEPOCH)
-                CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = "LPD64"\n",
+		CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = %lld\n",
                        oa->o_ioepoch);
         if (valid & OBD_MD_FLFID) {
                 CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n",
@@ -2336,7 +2336,7 @@ void dump_obdo(struct obdo *oa)
                        oa->o_parent_ver);
         }
         if (valid & OBD_MD_FLHANDLE)
-                CDEBUG(D_RPCTRACE, "obdo: o_handle = "LPD64"\n",
+		CDEBUG(D_RPCTRACE, "obdo: o_handle = %lld\n",
                        oa->o_handle.cookie);
 }
 
@@ -2398,7 +2398,7 @@ void _debug_req(struct ptlrpc_request *req,
 
 	va_start(args, fmt);
 	libcfs_debug_vmsg2(msgdata, fmt, args,
-			   " req@%p x"LPU64"/t"LPD64"("LPD64") o%d->%s@%s:%d/%d"
+			   " req@%p x%llu/t%lld(%lld) o%d->%s@%s:%d/%d"
 			   " lens %d/%d e %d to %d dl "CFS_TIME_T" ref %d "
 			   "fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n",
 			   req, req->rq_xid, req->rq_transno,