Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
a0eba5f
..
fbb03b2
100644
(file)
--- a/
lustre/ptlrpc/ptlrpcd.c
+++ b/
lustre/ptlrpc/ptlrpcd.c
@@
-103,6
+103,7
@@
void ptlrpcd_wake(struct ptlrpc_request *req)
cfs_waitq_signal(&rq_set->set_waitq);
}
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)
static struct ptlrpcd_ctl *
ptlrpcd_select_pc(struct ptlrpc_request *req, pdl_policy_t policy, int index)
@@
-238,6
+239,9
@@
void ptlrpcd_add_req(struct ptlrpc_request *req, pdl_policy_t policy, int idx)
{
struct ptlrpcd_ctl *pc;
{
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),
cfs_spin_lock(&req->rq_lock);
if (req->rq_invalid_rqset) {
struct l_wait_info lwi = LWI_TIMEOUT(cfs_time_seconds(5),
@@
-268,6
+272,7
@@
void ptlrpcd_add_req(struct ptlrpc_request *req, pdl_policy_t policy, int idx)
ptlrpc_set_add_new_req(pc, req);
}
ptlrpc_set_add_new_req(pc, req);
}
+EXPORT_SYMBOL(ptlrpcd_add_req);
static inline void ptlrpc_reqset_get(struct ptlrpc_request_set *set)
{
static inline void ptlrpc_reqset_get(struct ptlrpc_request_set *set)
{
@@
-875,6
+880,7
@@
int ptlrpcd_addref(void)
cfs_mutex_unlock(&ptlrpcd_mutex);
RETURN(rc);
}
cfs_mutex_unlock(&ptlrpcd_mutex);
RETURN(rc);
}
+EXPORT_SYMBOL(ptlrpcd_addref);
void ptlrpcd_decref(void)
{
void ptlrpcd_decref(void)
{
@@
-883,4
+889,5
@@
void ptlrpcd_decref(void)
ptlrpcd_fini();
cfs_mutex_unlock(&ptlrpcd_mutex);
}
ptlrpcd_fini();
cfs_mutex_unlock(&ptlrpcd_mutex);
}
+EXPORT_SYMBOL(ptlrpcd_decref);
/** @} ptlrpcd */
/** @} ptlrpcd */