From fbbc1258a057ff718dd9ba41dc32faf2aadc3a90 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Mon, 24 Jan 2022 16:02:25 -0600 Subject: [PATCH] LU-15478 lnet: Check LNET_NID_IS_ANY in LNET_NID_NET If LNET_NID_NET is passed the wildcard NID (LNET_ANY_NID) then we should return the wildcard net (LNET_NET_ANY). This also allows NULL to be used as an argument to LNET_NID_NET. Fixes: 005bd7075c ("LU-10391 lnet: Change lnet_send() to take large-addr nids") Signed-off-by: Chris Horn Change-Id: Ic2a7c9af31dcba285c266a872462cf179ab603fa Reviewed-on: https://review.whamcloud.com/46292 Tested-by: jenkins Reviewed-by: James Simmons Reviewed-by: Serguei Smirnov Tested-by: Maloo Reviewed-by: Oleg Drokin --- lnet/include/uapi/linux/lnet/lnet-types.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lnet/include/uapi/linux/lnet/lnet-types.h b/lnet/include/uapi/linux/lnet/lnet-types.h index ff02f24..d7fce9d 100644 --- a/lnet/include/uapi/linux/lnet/lnet-types.h +++ b/lnet/include/uapi/linux/lnet/lnet-types.h @@ -120,7 +120,10 @@ static inline int nid_is_nid4(const struct lnet_nid *nid) static inline __u32 LNET_NID_NET(const struct lnet_nid *nid) { - return LNET_MKNET(nid->nid_type, __be16_to_cpu(nid->nid_num)); + if (LNET_NID_IS_ANY(nid)) + return LNET_NET_ANY; + else + return LNET_MKNET(nid->nid_type, __be16_to_cpu(nid->nid_num)); } static inline void lnet_nid4_to_nid(lnet_nid_t nid4, struct lnet_nid *nid) -- 1.8.3.1