LU-10391 lnet: discard lnet_sock_accept()

[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 75387fb..059a5b4 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -194,6 +194,8 @@ lnet_net_lock_current(void)
 extern struct kmem_cache *lnet_mes_cachep;      /* MEs kmem_cache */
 extern struct kmem_cache *lnet_small_mds_cachep; /* <= LNET_SMALL_MD_SIZE bytes
                                                  * MDs kmem_cache */
+extern struct kmem_cache *lnet_rspt_cachep;
+extern struct kmem_cache *lnet_msg_cachep;
 
 static inline struct lnet_eq *
 lnet_eq_alloc (void)
@@ -256,6 +258,8 @@ lnet_md_free(struct lnet_libmd *md)
 {
        unsigned int  size;
 
+       LASSERTF(md->md_rspt_ptr == NULL, "md %p rsp %p\n", md, md->md_rspt_ptr);
+
        if ((md->md_options & LNET_MD_KIOV) != 0)
                size = offsetof(struct lnet_libmd, md_iov.kiov[md->md_niov]);
        else
@@ -369,28 +373,6 @@ lnet_wire_handle2md(struct lnet_handle_wire *wh)
 }
 
 static inline void
-lnet_me2handle(struct lnet_handle_me *handle, struct lnet_me *me)
-{
-       handle->cookie = me->me_lh.lh_cookie;
-}
-
-static inline struct lnet_me *
-lnet_handle2me(struct lnet_handle_me *handle)
-{
-       /* ALWAYS called with resource lock held */
-       struct lnet_libhandle *lh;
-       int              cpt;
-
-       cpt = lnet_cpt_of_cookie(handle->cookie);
-       lh = lnet_res_lh_lookup(the_lnet.ln_me_containers[cpt],
-                               handle->cookie);
-       if (lh == NULL)
-               return NULL;
-
-       return lh_entry(lh, struct lnet_me, me_lh);
-}
-
-static inline void
 lnet_peer_net_addref_locked(struct lnet_peer_net *lpn)
 {
        atomic_inc(&lpn->lpn_refcount);
@@ -482,9 +464,8 @@ lnet_msg_alloc(void)
 {
        struct lnet_msg *msg;
 
-       LIBCFS_ALLOC(msg, sizeof(*msg));
+       msg = kmem_cache_alloc(lnet_msg_cachep, GFP_NOFS | __GFP_ZERO);
 
-       /* no need to zero, LIBCFS_ALLOC does for us */
        return (msg);
 }
 
@@ -492,26 +473,30 @@ static inline void
 lnet_msg_free(struct lnet_msg *msg)
 {
        LASSERT(!msg->msg_onactivelist);
-       LIBCFS_FREE(msg, sizeof(*msg));
+       kmem_cache_free(lnet_msg_cachep, msg);
 }
 
 static inline struct lnet_rsp_tracker *
 lnet_rspt_alloc(int cpt)
 {
        struct lnet_rsp_tracker *rspt;
-       LIBCFS_ALLOC(rspt, sizeof(*rspt));
+
+       rspt = kmem_cache_alloc(lnet_rspt_cachep, GFP_NOFS | __GFP_ZERO);
        if (rspt) {
                lnet_net_lock(cpt);
                the_lnet.ln_counters[cpt]->lct_health.lch_rst_alloc++;
                lnet_net_unlock(cpt);
        }
+       CDEBUG(D_MALLOC, "rspt alloc %p\n", rspt);
        return rspt;
 }
 
 static inline void
 lnet_rspt_free(struct lnet_rsp_tracker *rspt, int cpt)
 {
-       LIBCFS_FREE(rspt, sizeof(*rspt));
+       CDEBUG(D_MALLOC, "rspt free %p\n", rspt);
+
+       kmem_cache_free(lnet_rspt_cachep, rspt);
        lnet_net_lock(cpt);
        the_lnet.ln_counters[cpt]->lct_health.lch_rst_alloc--;
        lnet_net_unlock(cpt);
@@ -862,7 +847,6 @@ int lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout);
 
 int lnet_sock_listen(struct socket **sockp, __u32 ip, int port, int backlog,
                     struct net *ns);
-int lnet_sock_accept(struct socket **newsockp, struct socket *sock);
 int lnet_sock_connect(struct socket **sockp, int *fatal,
                        __u32 local_ip, int local_port,
                        __u32 peer_ip, int peer_port, struct net *ns);
@@ -897,11 +881,6 @@ static inline void lnet_ping_buffer_decref(struct lnet_ping_buffer *pbuf)
                lnet_ping_buffer_free(pbuf);
 }
 
-static inline int lnet_ping_buffer_numref(struct lnet_ping_buffer *pbuf)
-{
-       return atomic_read(&pbuf->pb_refcnt);
-}
-
 static inline int lnet_push_target_resize_needed(void)
 {
        return the_lnet.ln_push_target->pb_nnis < the_lnet.ln_push_target_nnis;