From ef20f5e84e5457397da5b0e086c42ce6b79e2574 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Mon, 21 Oct 2019 20:38:21 -0500 Subject: [PATCH] LU-12756 lnet: Introduce lnet_msg_is_response Implement function to determine if an lnet_msg is a response (ACK or REPLY). Test-Parameters: trivial Signed-off-by: Chris Horn Change-Id: I8ba2d92866f8bb2caba120d9f23218bb7761143a Reviewed-on: https://review.whamcloud.com/36539 Reviewed-by: Neil Brown Reviewed-by: James Simmons Reviewed-by: Alexey Lyashkov Reviewed-by: Amir Shehata Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lnet/lnet/lib-move.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index b735341..332c038 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -63,6 +63,12 @@ struct lnet_send_data { __u32 sd_send_case; }; +static inline bool +lnet_msg_is_response(struct lnet_msg *msg) +{ + return msg->msg_type == LNET_MSG_ACK || msg->msg_type == LNET_MSG_REPLY; +} + static inline struct lnet_comm_count * get_stats_counts(struct lnet_element_stats *stats, enum lnet_stats_type stats_type) @@ -827,8 +833,7 @@ lnet_peer_alive_locked(struct lnet_ni *ni, struct lnet_peer_ni *lpni, return 1; /* always send any responses */ - if (msg->msg_type == LNET_MSG_ACK || - msg->msg_type == LNET_MSG_REPLY) + if (lnet_msg_is_response(msg)) return 1; if (!lnet_is_peer_deadline_passed(lpni, now)) @@ -1845,8 +1850,7 @@ static inline void lnet_set_non_mr_pref_nid(struct lnet_peer_ni *lpni, struct lnet_ni *lni, struct lnet_msg *msg) { - if (msg->msg_type != LNET_MSG_REPLY && msg->msg_type != LNET_MSG_ACK && - lpni->lpni_pref_nnids == 0) { + if (!lnet_msg_is_response(msg) && lpni->lpni_pref_nnids == 0) { CDEBUG(D_NET, "Setting preferred local NID %s on NMR peer %s\n", libcfs_nid2str(lni->ni_nid), libcfs_nid2str(lpni->lpni_nid)); @@ -2706,8 +2710,7 @@ again: else send_case |= MR_DST; - if (msg->msg_type == LNET_MSG_REPLY || - msg->msg_type == LNET_MSG_ACK) + if (lnet_msg_is_response(msg)) send_case |= SND_RESP; /* assign parameters to the send_data */ -- 1.8.3.1