Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-9119 lnet: rename LNET_MAX_INTERFACES
[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_proto.c
diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c
index 12165a3..98109ec 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_proto.c
+++ b/lnet/klnds/socklnd/socklnd_proto.c
@@ -286,7 +286,7 @@ ksocknal_match_tx(ksock_conn_t *conn, ksock_tx_t *tx, int nonblk)
         } else {
                 nob = tx->tx_lnetmsg->msg_len +
                       ((conn->ksnc_proto == &ksocknal_protocol_v1x) ?
-                      sizeof(lnet_hdr_t) : sizeof(struct ksock_msg));
+                      sizeof(struct lnet_hdr) : sizeof(struct ksock_msg));
         }
 
         /* default checking for typed connection */
@@ -361,14 +361,14 @@ ksocknal_match_tx_v3(ksock_conn_t *conn, ksock_tx_t *tx, int nonblk)
 static int
 ksocknal_handle_zcreq(ksock_conn_t *c, __u64 cookie, int remote)
 {
-       ksock_peer_t   *peer = c->ksnc_peer;
+       ksock_peer_ni_t   *peer_ni = c->ksnc_peer;
        ksock_conn_t   *conn;
        ksock_tx_t     *tx;
        int             rc;
 
        read_lock(&ksocknal_data.ksnd_global_lock);
 
-       conn = ksocknal_find_conn_locked(peer, NULL, !!remote);
+       conn = ksocknal_find_conn_locked(peer_ni, NULL, !!remote);
        if (conn != NULL) {
                ksock_sched_t *sched = conn->ksnc_scheduler;
 
@@ -393,7 +393,7 @@ ksocknal_handle_zcreq(ksock_conn_t *c, __u64 cookie, int remote)
         if (tx == NULL)
                 return -ENOMEM;
 
-        if ((rc = ksocknal_launch_packet(peer->ksnp_ni, tx, peer->ksnp_id)) == 0)
+        if ((rc = ksocknal_launch_packet(peer_ni->ksnp_ni, tx, peer_ni->ksnp_id)) == 0)
                 return 0;
 
         ksocknal_free_tx(tx);
@@ -404,7 +404,7 @@ ksocknal_handle_zcreq(ksock_conn_t *c, __u64 cookie, int remote)
 static int
 ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
 {
-        ksock_peer_t      *peer = conn->ksnc_peer;
+        ksock_peer_ni_t      *peer_ni = conn->ksnc_peer;
         ksock_tx_t        *tx;
         ksock_tx_t        *tmp;
        struct list_head        zlist = LIST_HEAD_INIT(zlist);
@@ -421,10 +421,10 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
                 return count == 1 ? 0 : -EPROTO;
         }
 
-       spin_lock(&peer->ksnp_lock);
+       spin_lock(&peer_ni->ksnp_lock);
 
        list_for_each_entry_safe(tx, tmp,
-                                     &peer->ksnp_zc_req_list, tx_zc_list) {
+                                     &peer_ni->ksnp_zc_req_list, tx_zc_list) {
                 __u64 c = tx->tx_msg.ksm_zc_cookies[0];
 
                 if (c == cookie1 || c == cookie2 || (cookie1 < c && c < cookie2)) {
@@ -437,7 +437,7 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
                 }
         }
 
-       spin_unlock(&peer->ksnp_lock);
+       spin_unlock(&peer_ni->ksnp_lock);
 
        while (!list_empty(&zlist)) {
                tx = list_entry(zlist.next, ksock_tx_t, tx_zc_list);
@@ -451,23 +451,24 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
 static int
 ksocknal_send_hello_v1 (ksock_conn_t *conn, struct ksock_hello_msg *hello)
 {
-       struct socket        *sock = conn->ksnc_sock;
-        lnet_hdr_t          *hdr;
-        lnet_magicversion_t *hmv;
-        int                  rc;
-        int                  i;
-
-        CLASSERT(sizeof(lnet_magicversion_t) == offsetof(lnet_hdr_t, src_nid));
-
-        LIBCFS_ALLOC(hdr, sizeof(*hdr));
-        if (hdr == NULL) {
-                CERROR("Can't allocate lnet_hdr_t\n");
-                return -ENOMEM;
-        }
+       struct socket *sock = conn->ksnc_sock;
+       struct lnet_hdr *hdr;
+       struct lnet_magicversion *hmv;
+       int rc;
+       int i;
+
+       CLASSERT(sizeof(struct lnet_magicversion) ==
+                offsetof(struct lnet_hdr, src_nid));
+
+       LIBCFS_ALLOC(hdr, sizeof(*hdr));
+       if (hdr == NULL) {
+               CERROR("Can't allocate struct lnet_hdr\n");
+               return -ENOMEM;
+       }
 
-        hmv = (lnet_magicversion_t *)&hdr->dest_nid;
+       hmv = (struct lnet_magicversion *)&hdr->dest_nid;
 
-        /* Re-organize V2.x message header to V1.x (lnet_hdr_t)
+       /* Re-organize V2.x message header to V1.x (struct lnet_hdr)
          * header and send out */
         hmv->magic         = cpu_to_le32 (LNET_PROTO_TCP_MAGIC);
         hmv->version_major = cpu_to_le16 (KSOCK_PROTO_V1_MAJOR);
@@ -568,19 +569,19 @@ ksocknal_send_hello_v2 (ksock_conn_t *conn, struct ksock_hello_msg *hello)
 static int
 ksocknal_recv_hello_v1(ksock_conn_t *conn, struct ksock_hello_msg *hello,int timeout)
 {
-       struct socket        *sock = conn->ksnc_sock;
-        lnet_hdr_t          *hdr;
-        int                  rc;
-        int                  i;
-
-        LIBCFS_ALLOC(hdr, sizeof(*hdr));
-        if (hdr == NULL) {
-                CERROR("Can't allocate lnet_hdr_t\n");
-                return -ENOMEM;
-        }
+       struct socket *sock = conn->ksnc_sock;
+       struct lnet_hdr *hdr;
+       int rc;
+       int i;
+
+       LIBCFS_ALLOC(hdr, sizeof(*hdr));
+       if (hdr == NULL) {
+               CERROR("Can't allocate struct lnet_hdr\n");
+               return -ENOMEM;
+       }
 
        rc = lnet_sock_read(sock, &hdr->src_nid,
-                             sizeof(*hdr) - offsetof(lnet_hdr_t, src_nid),
+                             sizeof(*hdr) - offsetof(struct lnet_hdr, src_nid),
                              timeout);
        if (rc != 0) {
                CERROR("Error %d reading rest of HELLO hdr from %pI4h\n",
@@ -606,12 +607,12 @@ ksocknal_recv_hello_v1(ksock_conn_t *conn, struct ksock_hello_msg *hello,int tim
         hello->kshm_nips            = le32_to_cpu (hdr->payload_length) /
                                          sizeof (__u32);
 
-        if (hello->kshm_nips > LNET_MAX_INTERFACES) {
+       if (hello->kshm_nips > LNET_NUM_INTERFACES) {
                CERROR("Bad nips %d from ip %pI4h\n",
                       hello->kshm_nips, &conn->ksnc_ipaddr);
-                rc = -EPROTO;
-                goto out;
-        }
+               rc = -EPROTO;
+               goto out;
+       }
 
         if (hello->kshm_nips == 0)
                 goto out;
@@ -676,11 +677,11 @@ ksocknal_recv_hello_v2(ksock_conn_t *conn, struct ksock_hello_msg *hello,
                 __swab32s(&hello->kshm_nips);
         }
 
-        if (hello->kshm_nips > LNET_MAX_INTERFACES) {
+       if (hello->kshm_nips > LNET_NUM_INTERFACES) {
                CERROR("Bad nips %d from ip %pI4h\n",
                       hello->kshm_nips, &conn->ksnc_ipaddr);
-                return -EPROTO;
-        }
+               return -EPROTO;
+       }
 
         if (hello->kshm_nips == 0)
                 return 0;
@@ -711,14 +712,15 @@ ksocknal_recv_hello_v2(ksock_conn_t *conn, struct ksock_hello_msg *hello,
 static void
 ksocknal_pack_msg_v1(ksock_tx_t *tx)
 {
-        /* V1.x has no KSOCK_MSG_NOOP */
-        LASSERT(tx->tx_msg.ksm_type != KSOCK_MSG_NOOP);
-        LASSERT(tx->tx_lnetmsg != NULL);
+       /* V1.x has no KSOCK_MSG_NOOP */
+       LASSERT(tx->tx_msg.ksm_type != KSOCK_MSG_NOOP);
+       LASSERT(tx->tx_lnetmsg != NULL);
 
-        tx->tx_iov[0].iov_base = (void *)&tx->tx_lnetmsg->msg_hdr;
-        tx->tx_iov[0].iov_len  = sizeof(lnet_hdr_t);
+       tx->tx_iov[0].iov_base = (void *)&tx->tx_lnetmsg->msg_hdr;
+       tx->tx_iov[0].iov_len  = sizeof(struct lnet_hdr);
 
-        tx->tx_resid = tx->tx_nob = tx->tx_lnetmsg->msg_len + sizeof(lnet_hdr_t);
+       tx->tx_nob = tx->tx_lnetmsg->msg_len + sizeof(struct lnet_hdr);
+       tx->tx_resid = tx->tx_nob;
 }
 
 static void
Lustre primary development and releases