Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f199a0c authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging: lustre: o2iblnd: handle unmapping of FMR in kiblnd_fmr_pool_unmap 



Move FMR unmapping from kiblnd_unmap_tx() to the function
kiblnd_fmr_pool_unmap() so kiblnd_unmap_tx() can be used
with the Fast Registration API as well.

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5783
Reviewed-on: http://review.whamcloud.com/17606


Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1b2e0b5

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c

+10 −4
Original line number Diff line number Diff line
@@ -1470,13 +1470,20 @@ void kiblnd_fmr_pool_unmap(kib_fmr_t *fmr, int status) 
{

	LIST_HEAD(zombies);

	kib_fmr_pool_t *fpo = fmr->fmr_pool;

	kib_fmr_poolset_t *fps = fpo->fpo_owner;

	kib_fmr_poolset_t *fps;

	unsigned long now = cfs_time_current();

	kib_fmr_pool_t *tmp;

	int rc;



	if (!fpo)

		return;



	fps = fpo->fpo_owner;

	if (fmr->fmr_pfmr) {

		rc = ib_fmr_pool_unmap(fmr->fmr_pfmr);

		LASSERT(!rc);

		fmr->fmr_pfmr = NULL;

	}



	if (status) {

		rc = ib_flush_fmr_pool(fpo->fmr.fpo_fmr_pool);
@@ -1484,7 +1491,6 @@ void kiblnd_fmr_pool_unmap(kib_fmr_t *fmr, int status) 
	}



	fmr->fmr_pool = NULL;

	fmr->fmr_pfmr = NULL;



	spin_lock(&fps->fps_lock);

	fpo->fpo_map_count--;  /* decref the pool */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+1 −3
Original line number Diff line number Diff line
@@ -613,10 +613,8 @@ static void kiblnd_unmap_tx(lnet_ni_t *ni, kib_tx_t *tx) 


	LASSERT(net);



	if (net->ibn_fmr_ps && tx->fmr.fmr_pfmr) {

	if (net->ibn_fmr_ps)

		kiblnd_fmr_pool_unmap(&tx->fmr, tx->tx_status);

		tx->fmr.fmr_pfmr = NULL;

	}



	if (tx->tx_nfrags) {

		kiblnd_dma_unmap_sg(tx->tx_pool->tpo_hdev->ibh_ibdev,