From faea5415efe81807f8ff0feeddb9d1da339512d9 Mon Sep 17 00:00:00 2001 From: tianzy Date: Tue, 24 Mar 2009 07:36:41 +0000 Subject: [PATCH] Branch b1_6 replace LPX64 with LPU64 for rq_xid b=18280 i=johann i=tianzy --- lustre/mds/mds_reint.c | 2 +- lustre/ptlrpc/lproc_ptlrpc.c | 2 +- lustre/ptlrpc/niobuf.c | 2 +- lustre/ptlrpc/pack_generic.c | 2 +- lustre/ptlrpc/recover.c | 2 +- lustre/ptlrpc/service.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index 4921f93..3937d5c 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -370,7 +370,7 @@ void mds_steal_ack_locks(struct ptlrpc_request *req) if (lustre_msg_get_opc(oldrep->rs_msg) != lustre_msg_get_opc(req->rq_reqmsg)) - CERROR ("Resent req xid "LPX64" has mismatched opc: " + CERROR ("Resent req xid "LPU64" has mismatched opc: " "new %d old %d\n", req->rq_xid, lustre_msg_get_opc(req->rq_reqmsg), lustre_msg_get_opc(oldrep->rs_msg)); diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c index 3e66ec5..634d263 100644 --- a/lustre/ptlrpc/lproc_ptlrpc.c +++ b/lustre/ptlrpc/lproc_ptlrpc.c @@ -436,7 +436,7 @@ static int ptlrpc_lprocfs_svc_req_history_show(struct seq_file *s, void *iter) * must be just as careful as the service's request * parser. Currently I only print stuff here I know is OK * to look at coz it was set up in request_in_callback()!!! */ - seq_printf(s, LPD64":%s:%s:x"LPD64":%d:%s:%ld:%lds(%+lds) ", + seq_printf(s, LPD64":%s:%s:x"LPU64":%d:%s:%ld:%lds(%+lds) ", req->rq_history_seq, libcfs_nid2str(req->rq_self), libcfs_id2str(req->rq_peer), req->rq_xid, req->rq_reqlen, ptlrpc_rqphase2str(req), diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c index 9f999e8..f5ed9dc 100644 --- a/lustre/ptlrpc/niobuf.c +++ b/lustre/ptlrpc/niobuf.c @@ -272,7 +272,7 @@ int ptlrpc_register_bulk(struct ptlrpc_request *req) RETURN (-ENOMEM); } - CDEBUG(D_NET, "Setup bulk %s buffers: %u pages %u bytes, xid "LPX64", " + CDEBUG(D_NET, "Setup bulk %s buffers: %u pages %u bytes, xid "LPU64", " "portal %u\n", desc->bd_type == BULK_GET_SOURCE ? "get-source" : "put-sink", desc->bd_iov_count, desc->bd_nob, diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c index f3b9748..231892a 100644 --- a/lustre/ptlrpc/pack_generic.c +++ b/lustre/ptlrpc/pack_generic.c @@ -2761,7 +2761,7 @@ void _debug_req(struct ptlrpc_request *req, __u32 mask, va_start(args, fmt); libcfs_debug_vmsg2(data->msg_cdls, data->msg_subsys, mask, data->msg_file, data->msg_fn, data->msg_line, fmt, args, - " req@%p x"LPD64"/t"LPD64" o%d->%s@%s:%d/%d lens %d/%d e %d " + " req@%p x"LPU64"/t"LPD64" o%d->%s@%s:%d/%d lens %d/%d e %d " "to %d dl %ld ref %d fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n", req, req->rq_xid, req->rq_transno, opc, req->rq_import ? obd2cli_tgt(req->rq_import->imp_obd) : diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c index 4adf785..e701f38 100644 --- a/lustre/ptlrpc/recover.c +++ b/lustre/ptlrpc/recover.c @@ -138,7 +138,7 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight) rc = ptlrpc_replay_req(req); if (rc) { CERROR("recovery replay error %d for req " - LPD64"\n", rc, req->rq_xid); + LPU64"\n", rc, req->rq_xid); RETURN(rc); } *inflight = 1; diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index c9981d2..e04c4c5 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -1185,7 +1185,7 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service *svc) goto err_req; } - CDEBUG(D_NET, "got req "LPD64"\n", req->rq_xid); + CDEBUG(D_NET, "got req "LPU64"\n", req->rq_xid); req->rq_export = class_conn2export( lustre_msg_get_handle(req->rq_reqmsg)); @@ -1321,7 +1321,7 @@ ptlrpc_server_handle_request(struct ptlrpc_service *svc, at_get(&svc->srv_at_estimate)); } - CDEBUG(D_NET, "got req "LPD64"\n", request->rq_xid); + CDEBUG(D_NET, "got req "LPU64"\n", request->rq_xid); request->rq_svc_thread = thread; if (request->rq_export) { -- 1.8.3.1