LU-3963 libcfs: remove proc handler wrappers

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

diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c
index f730e24..255a22b 100644 (file)
--- a/lnet/lnet/lib-md.c
+++ b/lnet/lnet/lib-md.c
@@ -79,8 +79,8 @@ lnet_md_unlink(lnet_libmd_t *md)
                (*md->md_eq->eq_refs[cpt])--;
        }
 
-       LASSERT(!cfs_list_empty(&md->md_list));
-       cfs_list_del_init(&md->md_list);
+       LASSERT(!list_empty(&md->md_list));
+       list_del_init(&md->md_list);
        lnet_md_free_locked(md);
 }
 
@@ -137,7 +137,7 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink)
                 for (i = 0; i < (int)niov; i++) {
                         /* We take the page pointer on trust */
                         if (lmd->md_iov.kiov[i].kiov_offset +
-                            lmd->md_iov.kiov[i].kiov_len > CFS_PAGE_SIZE )
+                           lmd->md_iov.kiov[i].kiov_len > PAGE_CACHE_SIZE)
                                 return -EINVAL; /* invalid length */
 
                         total_length += lmd->md_iov.kiov[i].kiov_len;
@@ -194,8 +194,8 @@ lnet_md_link(lnet_libmd_t *md, lnet_handle_eq_t eq_handle, int cpt)
 
        lnet_res_lh_initialize(container, &md->md_lh);
 
-       LASSERT(cfs_list_empty(&md->md_list));
-       cfs_list_add(&md->md_list, &container->rec_active);
+       LASSERT(list_empty(&md->md_list));
+       list_add(&md->md_list, &container->rec_active);
 
        return 0;
 }
@@ -267,8 +267,8 @@ int
 LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd,
             lnet_unlink_t unlink, lnet_handle_md_t *handle)
 {
-       CFS_LIST_HEAD           (matches);
-       CFS_LIST_HEAD           (drops);
+       struct list_head        matches = LIST_HEAD_INIT(matches);
+       struct list_head        drops = LIST_HEAD_INIT(drops);
        struct lnet_me          *me;
        struct lnet_libmd       *md;
        int                     cpt;
@@ -391,7 +391,8 @@ EXPORT_SYMBOL(LNetMDBind);
 
 /**
  * Unlink the memory descriptor from any ME it may be linked to and release
- * the internal resources associated with it.
+ * the internal resources associated with it. As a result, active messages
+ * associated with the MD may get aborted.
  *
  * This function does not free the memory region associated with the MD;
  * i.e., the memory the user allocated for this MD. If the ME associated with
@@ -437,15 +438,14 @@ LNetMDUnlink (lnet_handle_md_t mdh)
                 return -ENOENT;
         }
 
-        /* If the MD is busy, lnet_md_unlink just marks it for deletion, and
-         * when the NAL is done, the completion event flags that the MD was
-         * unlinked.  Otherwise, we enqueue an event now... */
-
-        if (md->md_eq != NULL &&
-            md->md_refcount == 0) {
-                lnet_build_unlink_event(md, &ev);
+       md->md_flags |= LNET_MD_FLAG_ABORTED;
+       /* If the MD is busy, lnet_md_unlink just marks it for deletion, and
+        * when the LND is done, the completion event flags that the MD was
+        * unlinked. Otherwise, we enqueue an event now... */
+       if (md->md_eq != NULL && md->md_refcount == 0) {
+               lnet_build_unlink_event(md, &ev);
                lnet_eq_enqueue_event(md->md_eq, &ev);
-        }
+       }
 
         lnet_md_unlink(md);