LU-1735 ptlrpc: only set jobid if not already set

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

diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index 4f646a1..fbb03b2 100644 (file)
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -105,6 +103,7 @@ void ptlrpcd_wake(struct ptlrpc_request *req)
 
         cfs_waitq_signal(&rq_set->set_waitq);
 }
+EXPORT_SYMBOL(ptlrpcd_wake);
 
 static struct ptlrpcd_ctl *
 ptlrpcd_select_pc(struct ptlrpc_request *req, pdl_policy_t policy, int index)
@@ -240,6 +239,9 @@ void ptlrpcd_add_req(struct ptlrpc_request *req, pdl_policy_t policy, int idx)
 {
         struct ptlrpcd_ctl *pc;
 
+       if (req->rq_reqmsg)
+               lustre_msg_set_jobid(req->rq_reqmsg, NULL);
+
         cfs_spin_lock(&req->rq_lock);
         if (req->rq_invalid_rqset) {
                 struct l_wait_info lwi = LWI_TIMEOUT(cfs_time_seconds(5),
@@ -270,6 +272,7 @@ void ptlrpcd_add_req(struct ptlrpc_request *req, pdl_policy_t policy, int idx)
 
         ptlrpc_set_add_new_req(pc, req);
 }
+EXPORT_SYMBOL(ptlrpcd_add_req);
 
 static inline void ptlrpc_reqset_get(struct ptlrpc_request_set *set)
 {
@@ -877,6 +880,7 @@ int ptlrpcd_addref(void)
         cfs_mutex_unlock(&ptlrpcd_mutex);
         RETURN(rc);
 }
+EXPORT_SYMBOL(ptlrpcd_addref);
 
 void ptlrpcd_decref(void)
 {
@@ -885,4 +889,5 @@ void ptlrpcd_decref(void)
                 ptlrpcd_fini();
         cfs_mutex_unlock(&ptlrpcd_mutex);
 }
+EXPORT_SYMBOL(ptlrpcd_decref);
 /** @} ptlrpcd */