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

Commit 3eeeb7a5 authored by Yuval Shaia's avatar Yuval Shaia Committed by Jason Gunthorpe
Browse files

IB/core: Make function ib_fmr_pool_unmap return void 



Since the function always returns 0 make it void.

Reported-by: default avatarHåkon Bugge <haakon.bugge@oracle.com>
Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Acked-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 89180e81

drivers/infiniband/core/fmr_pool.c

+1 −3
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ EXPORT_SYMBOL(ib_fmr_pool_map_phys); 
 * Unmap an FMR.  The FMR mapping may remain valid until the FMR is

 * reused (or until ib_flush_fmr_pool() is called).

 */

int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)

void ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)

{

	struct ib_fmr_pool *pool;

	unsigned long flags;
@@ -503,7 +503,5 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr) 
#endif



	spin_unlock_irqrestore(&pool->pool_lock, flags);



	return 0;

}

EXPORT_SYMBOL(ib_fmr_pool_unmap);

drivers/infiniband/ulp/iser/iser_memory.c

+1 −4
Original line number Diff line number Diff line
@@ -277,16 +277,13 @@ void iser_unreg_mem_fmr(struct iscsi_iser_task *iser_task, 
			enum iser_data_dir cmd_dir)

{

	struct iser_mem_reg *reg = &iser_task->rdma_reg[cmd_dir];

	int ret;



	if (!reg->mem_h)

		return;



	iser_dbg("PHYSICAL Mem.Unregister mem_h %p\n", reg->mem_h);



	ret = ib_fmr_pool_unmap((struct ib_pool_fmr *)reg->mem_h);

	if (ret)

		iser_err("ib_fmr_pool_unmap failed %d\n", ret);

	ib_fmr_pool_unmap((struct ib_pool_fmr *)reg->mem_h);



	reg->mem_h = NULL;

}

include/rdma/ib_fmr_pool.h

+1 −1
Original line number Diff line number Diff line
@@ -88,6 +88,6 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle, 
					 int                 list_len,

					 u64                 io_virtual_address);



int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr);

void ib_fmr_pool_unmap(struct ib_pool_fmr *fmr);



#endif /* IB_FMR_POOL_H */