summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>2016-12-04 16:25:43 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-30 08:39:10 +0000
commit1d625bd43d83b400edb90b71b23ced0efdc1f2d2 (patch)
treee9c4bfe084a9faf5d621a4c35baa97971f436ace /net
parent5ba1957f889f575f2a240eafe543c3fda5aa72e0 (diff)
downloadlinux-stable-1d625bd43d83b400edb90b71b23ced0efdc1f2d2.tar.gz
linux-stable-1d625bd43d83b400edb90b71b23ced0efdc1f2d2.tar.bz2
linux-stable-1d625bd43d83b400edb90b71b23ced0efdc1f2d2.zip
RDS: RDMA: fix the ib_map_mr_sg_zbva() argument
[ Upstream commit 3e56c2f856d7aba6a03feea834d68f9c05f7d0b6 ] Fixes warning: Using plain integer as NULL pointer Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/rds/ib_frmr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rds/ib_frmr.c b/net/rds/ib_frmr.c
index d921adc62765..66b3d6228a15 100644
--- a/net/rds/ib_frmr.c
+++ b/net/rds/ib_frmr.c
@@ -104,14 +104,15 @@ static int rds_ib_post_reg_frmr(struct rds_ib_mr *ibmr)
struct rds_ib_frmr *frmr = &ibmr->u.frmr;
struct ib_send_wr *failed_wr;
struct ib_reg_wr reg_wr;
- int ret;
+ int ret, off = 0;
while (atomic_dec_return(&ibmr->ic->i_fastreg_wrs) <= 0) {
atomic_inc(&ibmr->ic->i_fastreg_wrs);
cpu_relax();
}
- ret = ib_map_mr_sg_zbva(frmr->mr, ibmr->sg, ibmr->sg_len, 0, PAGE_SIZE);
+ ret = ib_map_mr_sg_zbva(frmr->mr, ibmr->sg, ibmr->sg_len,
+ &off, PAGE_SIZE);
if (unlikely(ret != ibmr->sg_len))
return ret < 0 ? ret : -EINVAL;