LU-56 lnet: abstract container for EQ/ME/MD

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

diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c
index 819263a..2ea5309 100644 (file)
--- a/lnet/lnet/lib-me.c
+++ b/lnet/lnet/lib-me.c
@@ -160,7 +160,7 @@ LNetMEAttach(unsigned int portal,
         me->me_unlink = unlink;
         me->me_md = NULL;
 
-        lnet_initialise_handle (&me->me_lh, LNET_COOKIE_TYPE_ME);
+       lnet_res_lh_initialize(&the_lnet.ln_me_container, &me->me_lh);
         head = lnet_portal_me_head(portal, match_id, match_bits);
         LASSERT (head != NULL);
 
@@ -215,7 +215,7 @@ LNetMEInsert(lnet_handle_me_t current_meh,
 
         current_me = lnet_handle2me(&current_meh);
         if (current_me == NULL) {
-                lnet_me_free (new_me);
+               lnet_me_free_locked(new_me);
 
                 LNET_UNLOCK();
                 return -ENOENT;
@@ -226,7 +226,7 @@ LNetMEInsert(lnet_handle_me_t current_meh,
         ptl = &the_lnet.ln_portals[current_me->me_portal];
         if (lnet_portal_is_unique(ptl)) {
                 /* nosense to insertion on unique portal */
-                lnet_me_free (new_me);
+               lnet_me_free_locked(new_me);
                 LNET_UNLOCK();
                 return -EPERM;
         }
@@ -238,7 +238,7 @@ LNetMEInsert(lnet_handle_me_t current_meh,
         new_me->me_unlink = unlink;
         new_me->me_md = NULL;
 
-        lnet_initialise_handle (&new_me->me_lh, LNET_COOKIE_TYPE_ME);
+       lnet_res_lh_initialize(&the_lnet.ln_me_container, &new_me->me_lh);
 
         if (pos == LNET_INS_AFTER)
                 cfs_list_add(&new_me->me_list, &current_me->me_list);
@@ -309,8 +309,8 @@ lnet_me_unlink(lnet_me_t *me)
                 lnet_md_unlink(me->me_md);
         }
 
-        lnet_invalidate_handle (&me->me_lh);
-        lnet_me_free(me);
+       lnet_res_lh_invalidate(&me->me_lh);
+       lnet_me_free_locked(me);
 }
 
 #if 0