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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
index cba961269b1f5686c380d56c84c55050c94d71e2..0b54e562f8baf687facff507d3905f66eb6e7730 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@@ -71,7 +71,6 @@
 /* this is a bit chunky */
 
 # define LPU64 "%llu"
-# define LPD64 "%lld"
 # define LPX64 "%#llx"
 
 #endif

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index 443318ed7265ba423d0efebdb9e22156be0ec344..1b85023e004ec873cbbe2b2f3c7065bcb97ac77e 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -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"
-              " incarnation:"LPD64" sched[%d:%d]\n",
+              " incarnation:%lld sched[%d:%d]\n",
               libcfs_id2str(peerid), conn->ksnc_proto->pro_version,
               &conn->ksnc_myipaddr, &conn->ksnc_ipaddr,
               conn->ksnc_port, incarnation, cpt,

diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index dbbbf0cab8e3835f986c4eb7885fd0e3db4ed1cf..d5ccbc36902ae782561c6d53291bf1399529c099 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -426,7 +426,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
        }
 
        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",
                        libcfs_id2str(peer), portal, matchbits, rc);
 

diff --git a/drivers/staging/lustre/lustre/lov/lov_pack.c b/drivers/staging/lustre/lustre/lov/lov_pack.c
index d7836bab0cfc3448c9488298cbd17401b72737e6..a5b190f32c0f0621452441e1f701f868b9478c89 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_pack.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pack.c
@@ -555,7 +555,7 @@ int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp,
                        return rc;
                if (ostid_id(&lmm_objects[i].l_ost_oi) > last_id) {
                        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,
                               POSTID(&lmm_objects[i].l_ost_oi), last_id);
                        return -EINVAL;

diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 54ea5fd12de044937314c05d9000808be158ba1d..5108f0daedf128cab35d5f345efef7e3424ad75e 100644 (file)
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -1457,7 +1457,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc,
                        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);
 
                rc = class_process_config(lcfg);
@@ -1560,7 +1560,7 @@ again:
        cfg->cfg_last_idx = res->mcr_offset;
        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);
 
        ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0);

diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 0f9a9cbb2a3a1478087b62cc68224119de31fc8b..fc17e5d30fd8d736af04f2c29a30860dd9dca591 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -420,7 +420,7 @@ int obd_init_checks(void)
        char buf[64];
        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);
 
@@ -468,7 +468,7 @@ int obd_init_checks(void)
                CWARN("LPU64 wrong length! strlen(%s)=%d != 20\n", buf, len);
                ret = -EINVAL;
        }
-       len = snprintf(buf, sizeof(buf), LPD64, u64val);
+       len = snprintf(buf, sizeof(buf), "%lld", u64val);
        if (len != 2) {
                CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len);
                ret = -EINVAL;

diff --git a/drivers/staging/lustre/lustre/obdclass/debug.c b/drivers/staging/lustre/lustre/obdclass/debug.c
index 18aedd2fc76301dcdabd9b7af488c8bcbce6bf57..885d99338de054e3030c612d9e5a87882cbf0f0d 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/debug.c
+++ b/drivers/staging/lustre/lustre/obdclass/debug.c
@@ -49,7 +49,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->len, nb->page, nb->rc);
        CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n",
                        nb->page ? page_index(nb->page) : -1);

diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 842c06e4426187c646629cc32d516b490e391888..be6fb102076d791c1c7f82241c38202c067b609c 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -1175,19 +1175,19 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v)
        if (ctr.lc_count == 0)
                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);
 
        if (rc < 0)
                goto out;
 
        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);
                if (rc < 0)
                        goto out;
                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)
                        goto out;
        }

diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 6fe43c164ea262134011ac5f3264b2406d168144..63a0e4bafe7fd7985a86a5c387bd52ec0e9f8b31 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -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));
 out_req:
        ptlrpc_req_finished(req);

diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index 5cadb94ddc61c49d4ed693cc4ea7746f666cc001..f43092506d75aebf7eaa98898f2d2bb969d7fca0 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -998,8 +998,8 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
        if (lustre_msg_get_last_committed(request->rq_repmsg) > 0 &&
            lustre_msg_get_last_committed(request->rq_repmsg) <
            aa->pcaa_peer_committed) {
-               CERROR("%s went back in time (transno "LPD64
-                      " was previously committed, server now claims "LPD64
+               CERROR("%s went back in time (transno %lld"
+                      " was previously committed, server now claims %lld"
                       ")!  See https://bugzilla.lustre.org/show_bug.cgi?"
                       "id=9646\n",
                       obd2cli_tgt(imp->imp_obd), aa->pcaa_peer_committed,

diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
index 9df1921ebbbab897a6d2cdc497c0d173b38f9121..3758b3ccca0cffa5c672ff060cd61cdc00b3af26 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
@@ -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
                 * 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"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),
                           libcfs_id2str(req->rq_peer), req->rq_xid,
                           req->rq_reqlen, ptlrpc_rqphase2str(req),

diff --git a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
index e890ed91a88633c36fb71f92ef1da792ea6299db..a8bcf5a8ce654e61ff09f2be524a17be81deb1fa 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
@@ -79,7 +79,7 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len,
                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);
 
        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,
                /* We're going to get an UNLINK event when I unlink below,
                 * which will complete just like any other failed send, so
                 * 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);
                rc2 = LNetMDUnlink(*mdh);
                LASSERTF(rc2 == 0, "rc2 = %d\n", rc2);

diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
index ffab15bd74f3646345e2d78b240d6b84d76d097f..6bdb53acb1adba3d7a8609ea428aa29386103e99 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
@@ -2308,17 +2308,17 @@ void dump_obdo(struct obdo *oa)
                CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = "LPX64"\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))
@@ -2344,7 +2344,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",
@@ -2353,7 +2353,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);
        if (valid & OBD_MD_FLCOOKIE)
                CDEBUG(D_RPCTRACE, "obdo: o_lcookie = "
@@ -2421,7 +2421,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"LPU64"/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,

diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index 0d100c06653949f323be27f6634102bcafd1da34..32a57d1ed39f6aeb75f7f17b4a3dba6397e2f037 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -2084,8 +2084,7 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs)
        if (nlocks == 0 && !been_handled) {
                /* If we see this, we should already have seen the warning
                 * in mds_steal_ack_locks()  */
-               CDEBUG(D_HA, "All locks stolen from rs %p x"LPD64".t"LPD64
-                      " o%d NID %s\n",
+               CDEBUG(D_HA, "All locks stolen from rs %p x%lld.t%lld o%d NID %s\n",
                       rs,
                       rs->rs_xid, rs->rs_transno, rs->rs_opc,
                       libcfs_nid2str(exp->exp_connection->c_peer.nid));