diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h index 8373a73d57501185671208d2a85deec2f1cf5a6d..b47fd8fd098d1c24b1210cfdb4837a569e0ce8aa 100644 --- a/lnet/klnds/gmlnd/gmlnd.h +++ b/lnet/klnds/gmlnd/gmlnd.h @@ -176,7 +176,7 @@ typedef struct gmnal_ni { gmnal_tx_t *gmni_txs; /* all txs */ gmnal_rx_t *gmni_rxs; /* all rx descs */ gmnal_txbuf_t *gmni_ltxbs; /* all large tx bufs */ - + atomic_t gmni_nthreads; /* total # threads */ gm_alarm_t gmni_alarm; /* alarm to wake caretaker */ int gmni_shutdown; /* tell all threads to exit */ diff --git a/lnet/klnds/gmlnd/gmlnd_cb.c b/lnet/klnds/gmlnd/gmlnd_cb.c index af1c026af230b76f0cd40085d0184ed441b3e9e2..a1a8df9bd48a9916f3fd73d6a856975ef7f580c8 100644 --- a/lnet/klnds/gmlnd/gmlnd_cb.c +++ b/lnet/klnds/gmlnd/gmlnd_cb.c @@ -44,7 +44,7 @@ gmnal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, LASSERT (msg->gmm_type == GMNAL_MSG_IMMEDIATE); LASSERT (iov == NULL || kiov == NULL); - + if (rx->rx_recv_nob < nob) { CERROR("Short message from nid %s: got %d, need %d\n", libcfs_nid2str(msg->gmm_srcnid), rx->rx_recv_nob, nob); @@ -134,7 +134,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) else lnet_copy_kiov2flat(len, buffer, 0, niov, kiov, offset, len); - + tx->tx_msgnob += len; tx->tx_large_nob = 0; } else { @@ -150,7 +150,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) LASSERT(tx->tx_lntmsg == NULL); tx->tx_lntmsg = lntmsg; - + spin_lock(&gmni->gmni_tx_lock); list_add_tail(&tx->tx_list, &gmni->gmni_buf_txq); diff --git a/lnet/klnds/gmlnd/gmlnd_utils.c b/lnet/klnds/gmlnd/gmlnd_utils.c index ab3244475cda6a15bb525cebd554508f1ad7de15..a39316550e065e8a18d82b1d972cccf58d01b68e 100644 --- a/lnet/klnds/gmlnd/gmlnd_utils.c +++ b/lnet/klnds/gmlnd/gmlnd_utils.c @@ -40,7 +40,6 @@ gmnal_alloc_netbuf_pages (gmnal_ni_t *gmni, gmnal_netbuf_t *nb, int npages) LASSERT (npages > 0); for (i = 0; i < npages; i++) { - nb->nb_kiov[i].kiov_page = alloc_page(GFP_KERNEL); nb->nb_kiov[i].kiov_offset = 0; nb->nb_kiov[i].kiov_len = PAGE_SIZE; @@ -70,13 +69,13 @@ gmnal_alloc_netbuf_pages (gmnal_ni_t *gmni, gmnal_netbuf_t *nb, int npages) gmnal_free_netbuf_pages(nb, i+1); return -ENOMEM; } - + if (i == 0) nb->nb_netaddr = gmni->gmni_netaddr_base; - + gmni->gmni_netaddr_base += PAGE_SIZE; } - + return 0; } @@ -99,7 +98,7 @@ gmnal_alloc_ltxbuf (gmnal_ni_t *gmni) int sz = offsetof(gmnal_txbuf_t, txb_buf.nb_kiov[npages]); gmnal_txbuf_t *txb; int rc; - + LIBCFS_ALLOC(txb, sz); if (txb == NULL) { CERROR("Can't allocate large txbuffer\n"); @@ -227,7 +226,7 @@ gmnal_alloc_ltxbufs (gmnal_ni_t *gmni) for (i = 0; i < nlarge_tx_bufs; i++) { rc = gmnal_alloc_ltxbuf(gmni); - + if (rc != 0) return rc; }