LU-1346 libcfs: cleanup cfs_curproc_xxx macros

[fs/lustre-release.git] / lustre / ptlrpc / client.c

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 883cb90..db3db53 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1448,7 +1448,7 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
        cfs_atomic_inc(&req->rq_import->imp_inflight);
        spin_unlock(&imp->imp_lock);
 
-        lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
+       lustre_msg_set_status(req->rq_reqmsg, current_pid());
 
         rc = sptlrpc_req_refresh_ctx(req, -1);
         if (rc) {
@@ -1461,12 +1461,12 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
                 }
         }
 
-        CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc"
-               " %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
-               imp->imp_obd->obd_uuid.uuid,
-               lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
-               libcfs_nid2str(imp->imp_connection->c_peer.nid),
-               lustre_msg_get_opc(req->rq_reqmsg));
+       CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc"
+              " %s:%s:%d:"LPU64":%s:%d\n", current_comm(),
+              imp->imp_obd->obd_uuid.uuid,
+              lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
+              libcfs_nid2str(imp->imp_connection->c_peer.nid),
+              lustre_msg_get_opc(req->rq_reqmsg));
 
         rc = ptl_send_rpc(req, 0);
         if (rc) {
@@ -1827,7 +1827,7 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
                CDEBUG(req->rq_reqmsg != NULL ? D_RPCTRACE : 0,
                        "Completed RPC pname:cluuid:pid:xid:nid:"
                        "opc %s:%s:%d:"LPU64":%s:%d\n",
-                       cfs_curproc_comm(), imp->imp_obd->obd_uuid.uuid,
+                       current_comm(), imp->imp_obd->obd_uuid.uuid,
                        lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
                        libcfs_nid2str(imp->imp_connection->c_peer.nid),
                        lustre_msg_get_opc(req->rq_reqmsg));
@@ -2629,8 +2629,8 @@ int ptlrpc_queue_wait(struct ptlrpc_request *req)
                 RETURN(-ENOMEM);
         }
 
-        /* for distributed debugging */
-        lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
+       /* for distributed debugging */
+       lustre_msg_set_status(req->rq_reqmsg, current_pid());
 
         /* add a ref for the set (see comment in ptlrpc_set_add_req) */
         ptlrpc_request_addref(req);