openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/core: Make function ib_fmr_pool_unmap return void 

Since the function always returns 0 make it void.

Reported-by: Håkon Bugge <haakon.bugge@oracle.com>
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Acked-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Yuval Shaia 2018-11-21 13:47:02 +02:00 committed by Jason Gunthorpe
parent 89180e814a
commit 3eeeb7a59a
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/core/fmr_pool.c
View File

@ -474,7 +474,7 @@ EXPORT_SYMBOL(ib_fmr_pool_map_phys);
* Unmap an FMR. The FMR mapping may remain valid until the FMR is * Unmap an FMR. The FMR mapping may remain valid until the FMR is
* reused (or until ib_flush_fmr_pool() is called). * 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; struct ib_fmr_pool *pool;
unsigned long flags; unsigned long flags;
@ -503,7 +503,5 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
#endif #endif
spin_unlock_irqrestore(&pool->pool_lock, flags); spin_unlock_irqrestore(&pool->pool_lock, flags);
return 0;
} }
EXPORT_SYMBOL(ib_fmr_pool_unmap); EXPORT_SYMBOL(ib_fmr_pool_unmap);

5
drivers/infiniband/ulp/iser/iser_memory.c
View File

@ -277,16 +277,13 @@ void iser_unreg_mem_fmr(struct iscsi_iser_task *iser_task,
enum iser_data_dir cmd_dir) enum iser_data_dir cmd_dir)
{ {
struct iser_mem_reg *reg = &iser_task->rdma_reg[cmd_dir]; struct iser_mem_reg *reg = &iser_task->rdma_reg[cmd_dir];
int ret;
if (!reg->mem_h) if (!reg->mem_h)
return; return;
iser_dbg("PHYSICAL Mem.Unregister mem_h %p\n", reg->mem_h); iser_dbg("PHYSICAL Mem.Unregister mem_h %p\n", reg->mem_h);
ret = ib_fmr_pool_unmap((struct ib_pool_fmr *)reg->mem_h); ib_fmr_pool_unmap((struct ib_pool_fmr *)reg->mem_h);
if (ret)
iser_err("ib_fmr_pool_unmap failed %d\n", ret);
reg->mem_h = NULL; reg->mem_h = NULL;
} }

2
include/rdma/ib_fmr_pool.h
View File

@ -88,6 +88,6 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,
int list_len, int list_len,
u64 io_virtual_address); 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 */ #endif /* IB_FMR_POOL_H */