X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fclient.c;h=5b74d897fb8c7272643aa2347836cab547a079c2;hp=c08850f292cbb99a9aaabf60b497c729e2548af9;hb=e1d0224fb4045571a2d71e3a802095d82086e5e9;hpb=005bd7075c8710fb8efaede1148870d2c0601aad diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index c08850f..5b74d89 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -1350,7 +1350,7 @@ static int ptlrpc_check_status(struct ptlrpc_request *req) rc = lustre_msg_get_status(req->rq_repmsg); if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) { struct obd_import *imp = req->rq_import; - lnet_nid_t nid = imp->imp_connection->c_peer.nid; + struct lnet_nid *nid = &imp->imp_connection->c_peer.nid; __u32 opc = lustre_msg_get_opc(req->rq_reqmsg); if (ptlrpc_console_allow(req, opc, rc)) @@ -1358,7 +1358,7 @@ static int ptlrpc_check_status(struct ptlrpc_request *req) "%s: operation %s to node %s failed: rc = %d\n", imp->imp_obd->obd_name, ll_opcode2str(opc), - libcfs_nid2str(nid), rc); + libcfs_nidstr(nid), rc); RETURN(rc < 0 ? rc : -EINVAL); } @@ -2290,7 +2290,7 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req, int async_unlink) req->rq_sent, req->rq_real_sent); if (imp && obd_debug_peer_on_timeout) - LNetDebugPeer(imp->imp_connection->c_peer); + LNetDebugPeer(&imp->imp_connection->c_peer); ptlrpc_unregister_reply(req, async_unlink); ptlrpc_unregister_bulk(req, async_unlink);