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-7734 lnet: Multi-Rail local NI split
[fs/lustre-release.git]
/
lnet
/
lnet
/
lib-ptl.c
diff --git
a/lnet/lnet/lib-ptl.c
b/lnet/lnet/lib-ptl.c
index
acba755
..
cddd7de
100644
(file)
--- a/
lnet/lnet/lib-ptl.c
+++ b/
lnet/lnet/lib-ptl.c
@@
-222,7
+222,7
@@
lnet_match2mt(struct lnet_portal *ptl, lnet_process_id_t id, __u64 mbits)
/* if it's a unique portal, return match-table hashed by NID */
return lnet_ptl_is_unique(ptl) ?
/* if it's a unique portal, return match-table hashed by NID */
return lnet_ptl_is_unique(ptl) ?
- ptl->ptl_mtables[lnet_cpt_of_nid(id.nid)] : NULL;
+ ptl->ptl_mtables[lnet_cpt_of_nid(id.nid
, NULL
)] : NULL;
}
struct lnet_match_table *
}
struct lnet_match_table *
@@
-292,7
+292,7
@@
lnet_mt_of_match(struct lnet_match_info *info, struct lnet_msg *msg)
rotor = ptl->ptl_rotor++; /* get round-robin factor */
if (portal_rotor == LNET_PTL_ROTOR_HASH_RT && routed)
rotor = ptl->ptl_rotor++; /* get round-robin factor */
if (portal_rotor == LNET_PTL_ROTOR_HASH_RT && routed)
- cpt =
lnet_cpt_of_nid(msg->msg_hdr.src_nid)
;
+ cpt =
info->mi_cpt
;
else
cpt = rotor % LNET_CPT_NUMBER;
else
cpt = rotor % LNET_CPT_NUMBER;
@@
-941,7
+941,7
@@
lnet_clear_lazy_portal(struct lnet_ni *ni, int portal, char *reason)
/* grab all messages which are on the NI passed in */
list_for_each_entry_safe(msg, tmp, &ptl->ptl_msg_delayed,
msg_list) {
/* grab all messages which are on the NI passed in */
list_for_each_entry_safe(msg, tmp, &ptl->ptl_msg_delayed,
msg_list) {
- if (msg->msg_
rxpeer->lp_
ni == ni)
+ if (msg->msg_
txni == ni || msg->msg_rx
ni == ni)
list_move(&msg->msg_list, &zombies);
}
} else {
list_move(&msg->msg_list, &zombies);
}
} else {