LU-13004 lnet: merge lnet_md_alloc into lnet_md_build.

[fs/lustre-release.git] / lnet / include / lnet / lib-lnet.h

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index 1179129..f028224 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -213,46 +213,6 @@ extern struct kmem_cache *lnet_small_mds_cachep; /* <= LNET_SMALL_MD_SIZE bytes
 extern struct kmem_cache *lnet_rspt_cachep;
 extern struct kmem_cache *lnet_msg_cachep;
 
-static inline struct lnet_libmd *
-lnet_md_alloc(struct lnet_md *umd)
-{
-       struct lnet_libmd *md;
-       unsigned int  size;
-       unsigned int  niov;
-
-       if ((umd->options & LNET_MD_KIOV) != 0) {
-               niov = umd->length;
-               size = offsetof(struct lnet_libmd, md_iov.kiov[niov]);
-       } else {
-               niov = 1;
-               size = offsetof(struct lnet_libmd, md_iov.iov[niov]);
-       }
-
-       if (size <= LNET_SMALL_MD_SIZE) {
-               md = kmem_cache_alloc(lnet_small_mds_cachep,
-                                     GFP_NOFS | __GFP_ZERO);
-               if (md) {
-                       CDEBUG(D_MALLOC, "slab-alloced 'md' of size %u at "
-                              "%p.\n", size, md);
-               } else {
-                       CDEBUG(D_MALLOC, "failed to allocate 'md' of size %u\n",
-                              size);
-                       return NULL;
-               }
-       } else {
-               LIBCFS_ALLOC(md, size);
-       }
-
-       if (md != NULL) {
-               /* Set here in case of early free */
-               md->md_options = umd->options;
-               md->md_niov = niov;
-               INIT_LIST_HEAD(&md->md_list);
-       }
-
-       return md;
-}
-
 static inline void
 lnet_md_free(struct lnet_libmd *md)
 {
@@ -767,7 +727,7 @@ lnet_copy_flat2kiov(unsigned int ndiov, struct bio_vec *dkiov,
 void lnet_me_unlink(struct lnet_me *me);
 
 void lnet_md_unlink(struct lnet_libmd *md);
-void lnet_md_deconstruct(struct lnet_libmd *lmd, struct lnet_md *umd);
+void lnet_md_deconstruct(struct lnet_libmd *lmd, struct lnet_event *ev);
 struct page *lnet_kvaddr_to_page(unsigned long vaddr);
 int lnet_cpt_of_md(struct lnet_libmd *md, unsigned int offset);
 
@@ -803,7 +763,8 @@ int lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout);
 struct socket *lnet_sock_listen(int port, int backlog,
                                struct net *ns);
 struct socket *lnet_sock_connect(int interface, int local_port,
-                                __u32 peer_ip, int peer_port, struct net *ns);
+                                struct sockaddr *peeraddr,
+                                struct net *ns);
 
 int lnet_peers_start_down(void);
 int lnet_peer_buffer_credits(struct lnet_net *net);