This is a note to let you know that I've just added the patch titled
RDS: RDMA: fix the ib_map_mr_sg_zbva() argument
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rds-rdma-fix-the-ib_map_mr_sg_zbva-argument.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Tue Nov 28 10:49:28 CET 2017
From: Santosh Shilimkar <santosh.shilimkar@xxxxxxxxxx>
Date: Sun, 4 Dec 2016 16:25:43 -0800
Subject: RDS: RDMA: fix the ib_map_mr_sg_zbva() argument
From: Santosh Shilimkar <santosh.shilimkar@xxxxxxxxxx>
[ Upstream commit 3e56c2f856d7aba6a03feea834d68f9c05f7d0b6 ]
Fixes warning: Using plain integer as NULL pointer
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxxxxxx>
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/rds/ib_frmr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/net/rds/ib_frmr.c
+++ b/net/rds/ib_frmr.c
@@ -104,14 +104,15 @@ static int rds_ib_post_reg_frmr(struct r
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;
Patches currently in stable-queue which might be from santosh.shilimkar@xxxxxxxxxx are
queue-4.9/rds-make-message-size-limit-compliant-with-spec.patch
queue-4.9/rds-rdma-return-appropriate-error-on-rdma-map-failures.patch
queue-4.9/rds-rdma-fix-the-ib_map_mr_sg_zbva-argument.patch