From f44f657ee218303220f41182ced4fac290266b7f Mon Sep 17 00:00:00 2001 From: Sergey Gorenko Date: Fri, 20 Sep 2019 16:34:48 +0300 Subject: [PATCH] LU-12789 o2ib: fix configure checks Fix configure checks for modern kernels / MOFED 4.7 1) sg_dma_address() and sg_dma_len() always have only one argument. 2) Make configure checks executed in proper enviroment Change-Id: I9910de888371776758376743ab4418778e1d85e4 Signed-off-by: Alexey Lyashkov Reviewed-on: https://review.whamcloud.com/36245 Tested-by: jenkins Reviewed-by: Shaun Tancheff Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/autoconf/lustre-lnet.m4 | 9 +++++---- lnet/klnds/o2iblnd/o2iblnd.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 85125f2..7c7764a 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -565,6 +565,11 @@ AS_IF([test $ENABLEO2IB != "no"], [ ]) EXTRA_KCFLAGS="$tmp_flags" + # 5.0 + LN_IB_DEVICE_OPS_EXISTS + # 5.1 + LN_IB_SG_DMA_ADDRESS_EXISTS + EXTRA_CHECK_INCLUDE="" ]) # ENABLEO2IB != "no" ]) # LN_CONFIG_O2IB @@ -861,10 +866,6 @@ LN_CONFIG_SOCK_ACCEPT LN_HAVE_ORACLE_OFED_EXTENSIONS # 4.17 LN_CONFIG_SOCK_GETNAME -# 5.0 -LN_IB_DEVICE_OPS_EXISTS -# 5.1 -LN_IB_SG_DMA_ADDRESS_EXISTS ]) # LN_PROG_LINUX # diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index 269306f..86e86a7 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.h +++ b/lnet/klnds/o2iblnd/o2iblnd.h @@ -1128,8 +1128,8 @@ static inline void kiblnd_dma_unmap_sg(struct ib_device *dev, #ifndef HAVE_IB_SG_DMA_ADDRESS #include -#define ib_sg_dma_address(dev, sg) sg_dma_address((dev), (sg)) -#define ib_sg_dma_len(dev, sg) sg_dma_len((dev), (sg)) +#define ib_sg_dma_address(dev, sg) sg_dma_address(sg) +#define ib_sg_dma_len(dev, sg) sg_dma_len(sg) #endif static inline __u64 kiblnd_sg_dma_address(struct ib_device *dev, -- 1.8.3.1