|
@@ -48,7 +48,7 @@ static int kiblnd_init_rdma(struct kib_conn *conn, struct kib_tx *tx, int type,
|
|
|
__u64 dstcookie);
|
|
|
static void kiblnd_queue_tx_locked(struct kib_tx *tx, struct kib_conn *conn);
|
|
|
static void kiblnd_queue_tx(struct kib_tx *tx, struct kib_conn *conn);
|
|
|
-static void kiblnd_unmap_tx(struct lnet_ni *ni, struct kib_tx *tx);
|
|
|
+static void kiblnd_unmap_tx(struct kib_tx *tx);
|
|
|
static void kiblnd_check_sends_locked(struct kib_conn *conn);
|
|
|
|
|
|
static void
|
|
@@ -66,7 +66,7 @@ kiblnd_tx_done(struct lnet_ni *ni, struct kib_tx *tx)
|
|
|
LASSERT(!tx->tx_waiting); /* mustn't be awaiting peer response */
|
|
|
LASSERT(tx->tx_pool);
|
|
|
|
|
|
- kiblnd_unmap_tx(ni, tx);
|
|
|
+ kiblnd_unmap_tx(tx);
|
|
|
|
|
|
/* tx may have up to 2 lnet msgs to finalise */
|
|
|
lntmsg[0] = tx->tx_lntmsg[0]; tx->tx_lntmsg[0] = NULL;
|
|
@@ -591,13 +591,9 @@ kiblnd_fmr_map_tx(struct kib_net *net, struct kib_tx *tx, struct kib_rdma_desc *
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void kiblnd_unmap_tx(struct lnet_ni *ni, struct kib_tx *tx)
|
|
|
+static void kiblnd_unmap_tx(struct kib_tx *tx)
|
|
|
{
|
|
|
- struct kib_net *net = ni->ni_data;
|
|
|
-
|
|
|
- LASSERT(net);
|
|
|
-
|
|
|
- if (net->ibn_fmr_ps)
|
|
|
+ if (tx->fmr.fmr_pfmr || tx->fmr.fmr_frd)
|
|
|
kiblnd_fmr_pool_unmap(&tx->fmr, tx->tx_status);
|
|
|
|
|
|
if (tx->tx_nfrags) {
|