From 46298ffe0b436a8cf1c60aa3d7bde7ae52c78d00 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Thu, 13 Jun 2019 14:04:54 -0500 Subject: [PATCH] LU-12355 lnet: ib_fmr_pool_unmap returns void Historically ib_fmr_pool_unmap only ever returned 0 Linux kernel 4.20 changed the return for ib_fmr_pool_unmap to void. Linux-commit: 3eeeb7a59acddaa326b03efdf6dce61c120449a3 Test-Parameters: trivial Signed-off-by: Shaun Tancheff Change-Id: I49d91a49c452dad5c7d9b153fdbc011f2f25743a Reviewed-on: https://review.whamcloud.com/35017 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: James Simmons Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 1da7cd7..29e82d7 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -1794,8 +1794,7 @@ kiblnd_fmr_pool_unmap(struct kib_fmr *fmr, int status) fps = fpo->fpo_owner; if (fpo->fpo_is_fmr) { if (fmr->fmr_pfmr) { - rc = ib_fmr_pool_unmap(fmr->fmr_pfmr); - LASSERT(!rc); + ib_fmr_pool_unmap(fmr->fmr_pfmr); fmr->fmr_pfmr = NULL; } -- 1.8.3.1