Commit f537dd2c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: lustre: remove LPD64 define

Just use the proper modifier type...

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7941e4d
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
/* this is a bit chunky */ /* this is a bit chunky */
# define LPU64 "%llu" # define LPU64 "%llu"
# define LPD64 "%lld"
# define LPX64 "%#llx" # define LPX64 "%#llx"
#endif #endif
...@@ -1289,7 +1289,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route, ...@@ -1289,7 +1289,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route,
*/ */
CDEBUG(D_NET, "New conn %s p %d.x %pI4h -> %pI4h/%d" CDEBUG(D_NET, "New conn %s p %d.x %pI4h -> %pI4h/%d"
" incarnation:"LPD64" sched[%d:%d]\n", " incarnation:%lld sched[%d:%d]\n",
libcfs_id2str(peerid), conn->ksnc_proto->pro_version, libcfs_id2str(peerid), conn->ksnc_proto->pro_version,
&conn->ksnc_myipaddr, &conn->ksnc_ipaddr, &conn->ksnc_myipaddr, &conn->ksnc_ipaddr,
conn->ksnc_port, incarnation, cpt, conn->ksnc_port, incarnation, cpt,
......
...@@ -426,7 +426,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len, ...@@ -426,7 +426,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
} }
if (rc != 0) { if (rc != 0) {
CERROR ("LNet%s(%s, %d, "LPD64") failed: %d\n", CERROR ("LNet%s(%s, %d, %lld) failed: %d\n",
((options & LNET_MD_OP_PUT) != 0) ? "Put" : "Get", ((options & LNET_MD_OP_PUT) != 0) ? "Put" : "Get",
libcfs_id2str(peer), portal, matchbits, rc); libcfs_id2str(peer), portal, matchbits, rc);
......
...@@ -555,7 +555,7 @@ int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp, ...@@ -555,7 +555,7 @@ int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp,
return rc; return rc;
if (ostid_id(&lmm_objects[i].l_ost_oi) > last_id) { if (ostid_id(&lmm_objects[i].l_ost_oi) > last_id) {
CERROR("Setting EA for object > than last id on" CERROR("Setting EA for object > than last id on"
" ost idx %d "DOSTID" > "LPD64" \n", " ost idx %d "DOSTID" > %lld \n",
lmm_objects[i].l_ost_idx, lmm_objects[i].l_ost_idx,
POSTID(&lmm_objects[i].l_ost_oi), last_id); POSTID(&lmm_objects[i].l_ost_oi), last_id);
return -EINVAL; return -EINVAL;
......
...@@ -1457,7 +1457,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, ...@@ -1457,7 +1457,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc,
break; break;
} }
CDEBUG(D_INFO, "ir apply logs "LPD64"/"LPD64" for %s -> %s\n", CDEBUG(D_INFO, "ir apply logs %lld/%lld for %s -> %s\n",
prev_version, max_version, obdname, params); prev_version, max_version, obdname, params);
rc = class_process_config(lcfg); rc = class_process_config(lcfg);
...@@ -1560,7 +1560,7 @@ static int mgc_process_recover_log(struct obd_device *obd, ...@@ -1560,7 +1560,7 @@ static int mgc_process_recover_log(struct obd_device *obd,
cfg->cfg_last_idx = res->mcr_offset; cfg->cfg_last_idx = res->mcr_offset;
eof = res->mcr_offset == res->mcr_size; eof = res->mcr_offset == res->mcr_size;
CDEBUG(D_INFO, "Latest version "LPD64", more %d.\n", CDEBUG(D_INFO, "Latest version %lld, more %d.\n",
res->mcr_offset, eof == false); res->mcr_offset, eof == false);
ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0); ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0);
......
...@@ -420,7 +420,7 @@ int obd_init_checks(void) ...@@ -420,7 +420,7 @@ int obd_init_checks(void)
char buf[64]; char buf[64];
int len, ret = 0; int len, ret = 0;
CDEBUG(D_INFO, "LPU64=%s, LPD64=%s, LPX64=%s\n", LPU64, LPD64, LPX64); CDEBUG(D_INFO, "LPU64=%s, LPD64=%s, LPX64=%s\n", LPU64, "%lld", LPX64);
CDEBUG(D_INFO, "OBD_OBJECT_EOF = "LPX64"\n", (__u64)OBD_OBJECT_EOF); CDEBUG(D_INFO, "OBD_OBJECT_EOF = "LPX64"\n", (__u64)OBD_OBJECT_EOF);
...@@ -468,7 +468,7 @@ int obd_init_checks(void) ...@@ -468,7 +468,7 @@ int obd_init_checks(void)
CWARN("LPU64 wrong length! strlen(%s)=%d != 20\n", buf, len); CWARN("LPU64 wrong length! strlen(%s)=%d != 20\n", buf, len);
ret = -EINVAL; ret = -EINVAL;
} }
len = snprintf(buf, sizeof(buf), LPD64, u64val); len = snprintf(buf, sizeof(buf), "%lld", u64val);
if (len != 2) { if (len != 2) {
CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len); CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len);
ret = -EINVAL; ret = -EINVAL;
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
void dump_lniobuf(struct niobuf_local *nb) void dump_lniobuf(struct niobuf_local *nb)
{ {
CDEBUG(D_RPCTRACE, 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->len, nb->page, nb->rc); nb->lnb_file_offset, nb->len, nb->page, nb->rc);
CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n", CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n",
nb->page ? page_index(nb->page) : -1); nb->page ? page_index(nb->page) : -1);
......
...@@ -1175,19 +1175,19 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v) ...@@ -1175,19 +1175,19 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v)
if (ctr.lc_count == 0) if (ctr.lc_count == 0)
goto out; goto out;
rc = seq_printf(p, "%-25s "LPD64" samples [%s]", hdr->lc_name, rc = seq_printf(p, "%-25s %lld samples [%s]", hdr->lc_name,
ctr.lc_count, hdr->lc_units); ctr.lc_count, hdr->lc_units);
if (rc < 0) if (rc < 0)
goto out; goto out;
if ((hdr->lc_config & LPROCFS_CNTR_AVGMINMAX) && (ctr.lc_count > 0)) { if ((hdr->lc_config & LPROCFS_CNTR_AVGMINMAX) && (ctr.lc_count > 0)) {
rc = seq_printf(p, " "LPD64" "LPD64" "LPD64, rc = seq_printf(p, " %lld %lld %lld",
ctr.lc_min, ctr.lc_max, ctr.lc_sum); ctr.lc_min, ctr.lc_max, ctr.lc_sum);
if (rc < 0) if (rc < 0)
goto out; goto out;
if (hdr->lc_config & LPROCFS_CNTR_STDDEV) if (hdr->lc_config & LPROCFS_CNTR_STDDEV)
rc = seq_printf(p, " "LPD64, ctr.lc_sumsquare); rc = seq_printf(p, " %lld", ctr.lc_sumsquare);
if (rc < 0) if (rc < 0)
goto out; goto out;
} }
......
...@@ -483,7 +483,7 @@ int osc_real_create(struct obd_export *exp, struct obdo *oa, ...@@ -483,7 +483,7 @@ int osc_real_create(struct obd_export *exp, struct obdo *oa,
} }
} }
CDEBUG(D_HA, "transno: "LPD64"\n", CDEBUG(D_HA, "transno: %lld\n",
lustre_msg_get_transno(req->rq_repmsg)); lustre_msg_get_transno(req->rq_repmsg));
out_req: out_req:
ptlrpc_req_finished(req); ptlrpc_req_finished(req);
......
...@@ -998,8 +998,8 @@ static int ptlrpc_connect_interpret(const struct lu_env *env, ...@@ -998,8 +998,8 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
if (lustre_msg_get_last_committed(request->rq_repmsg) > 0 && if (lustre_msg_get_last_committed(request->rq_repmsg) > 0 &&
lustre_msg_get_last_committed(request->rq_repmsg) < lustre_msg_get_last_committed(request->rq_repmsg) <
aa->pcaa_peer_committed) { aa->pcaa_peer_committed) {
CERROR("%s went back in time (transno "LPD64 CERROR("%s went back in time (transno %lld"
" was previously committed, server now claims "LPD64 " was previously committed, server now claims %lld"
")! See https://bugzilla.lustre.org/show_bug.cgi?" ")! See https://bugzilla.lustre.org/show_bug.cgi?"
"id=9646\n", "id=9646\n",
obd2cli_tgt(imp->imp_obd), aa->pcaa_peer_committed, obd2cli_tgt(imp->imp_obd), aa->pcaa_peer_committed,
......
...@@ -932,7 +932,7 @@ static int ptlrpc_lprocfs_svc_req_history_show(struct seq_file *s, void *iter) ...@@ -932,7 +932,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 * must be just as careful as the service's request
* parser. Currently I only print stuff here I know is OK * parser. Currently I only print stuff here I know is OK
* to look at coz it was set up in request_in_callback()!!! */ * to look at coz it was set up in request_in_callback()!!! */
seq_printf(s, LPD64":%s:%s:x"LPU64":%d:%s:%ld:%lds(%+lds) ", seq_printf(s, "%lld:%s:%s:x"LPU64":%d:%s:%ld:%lds(%+lds) ",
req->rq_history_seq, libcfs_nid2str(req->rq_self), req->rq_history_seq, libcfs_nid2str(req->rq_self),
libcfs_id2str(req->rq_peer), req->rq_xid, libcfs_id2str(req->rq_peer), req->rq_xid,
req->rq_reqlen, ptlrpc_rqphase2str(req), req->rq_reqlen, ptlrpc_rqphase2str(req),
......
...@@ -79,7 +79,7 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len, ...@@ -79,7 +79,7 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len,
return -ENOMEM; return -ENOMEM;
} }
CDEBUG(D_NET, "Sending %d bytes to portal %d, xid "LPD64", offset %u\n", CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %lld, offset %u\n",
len, portal, xid, offset); len, portal, xid, offset);
rc = LNetPut(conn->c_self, *mdh, ack, rc = LNetPut(conn->c_self, *mdh, ack,
...@@ -89,7 +89,7 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len, ...@@ -89,7 +89,7 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len,
/* We're going to get an UNLINK event when I unlink below, /* We're going to get an UNLINK event when I unlink below,
* which will complete just like any other failed send, so * which will complete just like any other failed send, so
* I fall through and return success here! */ * I fall through and return success here! */
CERROR("LNetPut(%s, %d, "LPD64") failed: %d\n", CERROR("LNetPut(%s, %d, %lld) failed: %d\n",
libcfs_id2str(conn->c_peer), portal, xid, rc); libcfs_id2str(conn->c_peer), portal, xid, rc);
rc2 = LNetMDUnlink(*mdh); rc2 = LNetMDUnlink(*mdh);
LASSERTF(rc2 == 0, "rc2 = %d\n", rc2); LASSERTF(rc2 == 0, "rc2 = %d\n", rc2);
......
...@@ -2308,17 +2308,17 @@ void dump_obdo(struct obdo *oa) ...@@ -2308,17 +2308,17 @@ void dump_obdo(struct obdo *oa)
CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = "LPX64"\n", CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = "LPX64"\n",
oa->o_parent_seq); oa->o_parent_seq);
if (valid & OBD_MD_FLSIZE) 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) 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) 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) 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 */ 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) 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) if (valid & OBD_MD_FLBLKSZ)
CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize); CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize);
if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE)) if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE))
...@@ -2344,7 +2344,7 @@ void dump_obdo(struct obdo *oa) ...@@ -2344,7 +2344,7 @@ void dump_obdo(struct obdo *oa)
CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n", CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n",
oa->o_parent_oid); oa->o_parent_oid);
if (valid & OBD_MD_FLEPOCH) if (valid & OBD_MD_FLEPOCH)
CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = "LPD64"\n", CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = %lld\n",
oa->o_ioepoch); oa->o_ioepoch);
if (valid & OBD_MD_FLFID) { if (valid & OBD_MD_FLFID) {
CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n", CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n",
...@@ -2353,7 +2353,7 @@ void dump_obdo(struct obdo *oa) ...@@ -2353,7 +2353,7 @@ void dump_obdo(struct obdo *oa)
oa->o_parent_ver); oa->o_parent_ver);
} }
if (valid & OBD_MD_FLHANDLE) 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); oa->o_handle.cookie);
if (valid & OBD_MD_FLCOOKIE) if (valid & OBD_MD_FLCOOKIE)
CDEBUG(D_RPCTRACE, "obdo: o_lcookie = " CDEBUG(D_RPCTRACE, "obdo: o_lcookie = "
...@@ -2421,7 +2421,7 @@ void _debug_req(struct ptlrpc_request *req, ...@@ -2421,7 +2421,7 @@ void _debug_req(struct ptlrpc_request *req,
va_start(args, fmt); va_start(args, fmt);
libcfs_debug_vmsg2(msgdata, fmt, args, libcfs_debug_vmsg2(msgdata, fmt, args,
" req@%p x"LPU64"/t"LPD64"("LPD64") o%d->%s@%s:%d/%d" " req@%p x"LPU64"/t%lld(%lld) o%d->%s@%s:%d/%d"
" lens %d/%d e %d to %d dl "CFS_TIME_T" ref %d " " lens %d/%d e %d to %d dl "CFS_TIME_T" ref %d "
"fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n", "fl "REQ_FLAGS_FMT"/%x/%x rc %d/%d\n",
req, req->rq_xid, req->rq_transno, req, req->rq_xid, req->rq_transno,
......
...@@ -2084,8 +2084,7 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs) ...@@ -2084,8 +2084,7 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs)
if (nlocks == 0 && !been_handled) { if (nlocks == 0 && !been_handled) {
/* If we see this, we should already have seen the warning /* If we see this, we should already have seen the warning
* in mds_steal_ack_locks() */ * in mds_steal_ack_locks() */
CDEBUG(D_HA, "All locks stolen from rs %p x"LPD64".t"LPD64 CDEBUG(D_HA, "All locks stolen from rs %p x%lld.t%lld o%d NID %s\n",
" o%d NID %s\n",
rs, rs,
rs->rs_xid, rs->rs_transno, rs->rs_opc, rs->rs_xid, rs->rs_transno, rs->rs_opc,
libcfs_nid2str(exp->exp_connection->c_peer.nid)); libcfs_nid2str(exp->exp_connection->c_peer.nid));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment