projects / deliverable / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
staging: lustre: remove LPX64 define
[deliverable/linux.git] / drivers / staging / lustre / lnet / lnet / lib-move.c
diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c
index 45412a5444c2682bc83bd4834e13d862c73b46aa..4b9567d67f33a8e1ae22242b7af2f7362eb26fcb 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@@ -751,7 +751,7 @@ lnet_peer_alive_locked(lnet_peer_t *lp)
                           cfs_time_add(lp->lp_last_query,
                                        cfs_time_seconds(lnet_queryinterval));
 
-               if (cfs_time_before(now, next_query)) {
+               if (time_before(now, next_query)) {
                        if (lp->lp_alive)
                                CWARN("Unexpected aliveness of peer %s: "
                                      "%d < %d (%d/%d)\n",
@@ -1426,8 +1426,7 @@ lnet_parse_put(lnet_ni_t *ni, lnet_msg_t *msg)
                /* fall through */
 
        case LNET_MATCHMD_DROP:
-               CNETERR("Dropping PUT from %s portal %d match "LPU64
-                       " offset %d length %d: %d\n",
+               CNETERR("Dropping PUT from %s portal %d match %llu offset %d length %d: %d\n",
                        libcfs_id2str(info.mi_id), info.mi_portal,
                        info.mi_mbits, info.mi_roffset, info.mi_rlength, rc);
 
@@ -1459,8 +1458,7 @@ lnet_parse_get(lnet_ni_t *ni, lnet_msg_t *msg, int rdma_get)
 
        rc = lnet_ptl_match_md(&info, msg);
        if (rc == LNET_MATCHMD_DROP) {
-               CNETERR("Dropping GET from %s portal %d match "LPU64
-                       " offset %d length %d\n",
+               CNETERR("Dropping GET from %s portal %d match %llu offset %d length %d\n",
                        libcfs_id2str(info.mi_id), info.mi_portal,
                        info.mi_mbits, info.mi_roffset, info.mi_rlength);
                return ENOENT;  /* +ve: OK but no match */
@@ -1520,8 +1518,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
        /* NB handles only looked up by creator (no flips) */
        md = lnet_wire_handle2md(&hdr->msg.reply.dst_wmd);
        if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) {
-               CNETERR("%s: Dropping REPLY from %s for %s "
-                       "MD "LPX64"."LPX64"\n",
+               CNETERR("%s: Dropping REPLY from %s for %s MD %#llx.%#llx\n",
                        libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
                        (md == NULL) ? "invalid" : "inactive",
                        hdr->msg.reply.dst_wmd.wh_interface_cookie,
@@ -1541,8 +1538,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
 
        if (mlength < rlength &&
            (md->md_options & LNET_MD_TRUNCATE) == 0) {
-               CNETERR("%s: Dropping REPLY from %s length %d "
-                       "for MD "LPX64" would overflow (%d)\n",
+               CNETERR("%s: Dropping REPLY from %s length %d for MD %#llx would overflow (%d)\n",
                        libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
                        rlength, hdr->msg.reply.dst_wmd.wh_object_cookie,
                        mlength);
@@ -1550,7 +1546,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
                return ENOENT;    /* +ve: OK but no match */
        }
 
-       CDEBUG(D_NET, "%s: Reply from %s of length %d/%d into md "LPX64"\n",
+       CDEBUG(D_NET, "%s: Reply from %s of length %d/%d into md %#llx\n",
               libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
               mlength, rlength, hdr->msg.reply.dst_wmd.wh_object_cookie);
 
@@ -1590,7 +1586,7 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg)
        if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) {
                /* Don't moan; this is expected */
                CDEBUG(D_NET,
-                      "%s: Dropping ACK from %s to %s MD "LPX64"."LPX64"\n",
+                      "%s: Dropping ACK from %s to %s MD %#llx.%#llx\n",
                       libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
                       (md == NULL) ? "invalid" : "inactive",
                       hdr->msg.ack.dst_wmd.wh_interface_cookie,
@@ -1603,7 +1599,7 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg)
                return ENOENT;            /* +ve! */
        }
 
-       CDEBUG(D_NET, "%s: ACK from %s into md "LPX64"\n",
+       CDEBUG(D_NET, "%s: ACK from %s into md %#llx\n",
               libcfs_nid2str(ni->ni_nid), libcfs_id2str(src),
               hdr->msg.ack.dst_wmd.wh_object_cookie);
 
@@ -1680,20 +1676,20 @@ lnet_print_hdr(lnet_hdr_t *hdr)
                break;
 
        case LNET_MSG_PUT:
-               CWARN("    Ptl index %d, ack md "LPX64"."LPX64", "
-                     "match bits "LPU64"\n",
+               CWARN("    Ptl index %d, ack md %#llx.%#llx, "
+                     "match bits %llu\n",
                      hdr->msg.put.ptl_index,
                      hdr->msg.put.ack_wmd.wh_interface_cookie,
                      hdr->msg.put.ack_wmd.wh_object_cookie,
                      hdr->msg.put.match_bits);
-               CWARN("    Length %d, offset %d, hdr data "LPX64"\n",
+               CWARN("    Length %d, offset %d, hdr data %#llx\n",
                      hdr->payload_length, hdr->msg.put.offset,
                      hdr->msg.put.hdr_data);
                break;
 
        case LNET_MSG_GET:
-               CWARN("    Ptl index %d, return md "LPX64"."LPX64", "
-                     "match bits "LPU64"\n", hdr->msg.get.ptl_index,
+               CWARN("    Ptl index %d, return md %#llx.%#llx, "
+                     "match bits %llu\n", hdr->msg.get.ptl_index,
                      hdr->msg.get.return_wmd.wh_interface_cookie,
                      hdr->msg.get.return_wmd.wh_object_cookie,
                      hdr->msg.get.match_bits);
@@ -1703,7 +1699,7 @@ lnet_print_hdr(lnet_hdr_t *hdr)
                break;
 
        case LNET_MSG_ACK:
-               CWARN("    dst md "LPX64"."LPX64", "
+               CWARN("    dst md %#llx.%#llx, "
                      "manipulated length %d\n",
                      hdr->msg.ack.dst_wmd.wh_interface_cookie,
                      hdr->msg.ack.dst_wmd.wh_object_cookie,
@@ -1711,7 +1707,7 @@ lnet_print_hdr(lnet_hdr_t *hdr)
                break;
 
        case LNET_MSG_REPLY:
-               CWARN("    dst md "LPX64"."LPX64", "
+               CWARN("    dst md %#llx.%#llx, "
                      "length %d\n",
                      hdr->msg.reply.dst_wmd.wh_interface_cookie,
                      hdr->msg.reply.dst_wmd.wh_object_cookie,
@@ -1963,8 +1959,7 @@ lnet_drop_delayed_msg_list(struct list_head *head, char *reason)
                LASSERT(msg->msg_rxpeer != NULL);
                LASSERT(msg->msg_hdr.type == LNET_MSG_PUT);
 
-               CWARN("Dropping delayed PUT from %s portal %d match "LPU64
-                     " offset %d length %d: %s\n",
+               CWARN("Dropping delayed PUT from %s portal %d match %llu offset %d length %d: %s\n",
                      libcfs_id2str(id),
                      msg->msg_hdr.msg.put.ptl_index,
                      msg->msg_hdr.msg.put.match_bits,
@@ -2009,7 +2004,7 @@ lnet_recv_delayed_msg_list(struct list_head *head)
                LASSERT(msg->msg_hdr.type == LNET_MSG_PUT);
 
                CDEBUG(D_NET, "Resuming delayed PUT from %s portal %d "
-                      "match "LPU64" offset %d length %d.\n",
+                      "match %llu offset %d length %d.\n",
                        libcfs_id2str(id), msg->msg_hdr.msg.put.ptl_index,
                        msg->msg_hdr.msg.put.match_bits,
                        msg->msg_hdr.msg.put.offset,
@@ -2097,7 +2092,7 @@ LNetPut(lnet_nid_t self, lnet_handle_md_t mdh, lnet_ack_req_t ack,
 
        md = lnet_handle2md(&mdh);
        if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) {
-               CERROR("Dropping PUT ("LPU64":%d:%s): MD (%d) invalid\n",
+               CERROR("Dropping PUT (%llu:%d:%s): MD (%d) invalid\n",
                       match_bits, portal, libcfs_id2str(target),
                       md == NULL ? -1 : md->md_threshold);
                if (md != NULL && md->md_me != NULL)
@@ -2296,7 +2291,7 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh,
 
        md = lnet_handle2md(&mdh);
        if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) {
-               CERROR("Dropping GET ("LPU64":%d:%s): MD (%d) invalid\n",
+               CERROR("Dropping GET (%llu:%d:%s): MD (%d) invalid\n",
                       match_bits, portal, libcfs_id2str(target),
                       md == NULL ? -1 : md->md_threshold);
                if (md != NULL && md->md_me != NULL)
Linux kernel - Deliverables
This page took 0.033697 seconds and 5 git commands to generate.