LU-6142 lnet: use list_first_entry() in lnet/lnet subdirectory.

[fs/lustre-release.git] / lnet / lnet / lib-ptl.c

diff --git a/lnet/lnet/lib-ptl.c b/lnet/lnet/lib-ptl.c
index 95b541f..4196424 100644 (file)
--- a/lnet/lnet/lib-ptl.c
+++ b/lnet/lnet/lib-ptl.c
@@ -279,8 +279,8 @@ lnet_mt_of_match(struct lnet_match_info *info, struct lnet_msg *msg)
                return mtable;
 
        /* it's a wildcard portal */
-       routed = LNET_NIDNET(msg->msg_hdr.src_nid) !=
-                LNET_NIDNET(msg->msg_hdr.dest_nid);
+       routed = LNET_NID_NET(&msg->msg_hdr.src_nid) !=
+                LNET_NID_NET(&msg->msg_hdr.dest_nid);
 
        if (portal_rotor == LNET_PTL_ROTOR_OFF ||
            (portal_rotor != LNET_PTL_ROTOR_ON && !routed)) {
@@ -765,9 +765,9 @@ lnet_ptl_cleanup(struct lnet_portal *ptl)
                mhash = mtable->mt_mhash;
                /* cleanup ME */
                for (j = 0; j < LNET_MT_HASH_SIZE + 1; j++) {
-                       while (!list_empty(&mhash[j])) {
-                               me = list_entry(mhash[j].next,
-                                               struct lnet_me, me_list);
+                       while ((me = list_first_entry_or_null(&mhash[j],
+                                                             struct lnet_me,
+                                                             me_list)) != NULL) {
                                CERROR("Active ME %p on exit\n", me);
                                list_del(&me->me_list);
                                CDEBUG(D_MALLOC,