4.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Gal Pressman <pressman...@gmail.com>

[ Upstream commit a1ceeca679dccc492235f0f629d9e9f7b3d51ca8 ]

hns bitmap allocation functions return 0 on success and -1 on failure.
Callers of these functions wrongly used their return value as an errno,
fix that by making a proper conversion.

Fixes: a598c6f4c5a8 ("IB/hns: Simplify function of pd alloc and qp alloc")
Signed-off-by: Gal Pressman <pressman...@gmail.com>
Acked-by: Lijun Ou <ouli...@huawei.com>
Signed-off-by: Jason Gunthorpe <j...@mellanox.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/infiniband/hw/hns/hns_roce_pd.c |    2 +-
 drivers/infiniband/hw/hns/hns_roce_qp.c |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- a/drivers/infiniband/hw/hns/hns_roce_pd.c
+++ b/drivers/infiniband/hw/hns/hns_roce_pd.c
@@ -37,7 +37,7 @@
 
 static int hns_roce_pd_alloc(struct hns_roce_dev *hr_dev, unsigned long *pdn)
 {
-       return hns_roce_bitmap_alloc(&hr_dev->pd_bitmap, pdn);
+       return hns_roce_bitmap_alloc(&hr_dev->pd_bitmap, pdn) ? -ENOMEM : 0;
 }
 
 static void hns_roce_pd_free(struct hns_roce_dev *hr_dev, unsigned long pdn)
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -115,7 +115,10 @@ static int hns_roce_reserve_range_qp(str
 {
        struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;
 
-       return hns_roce_bitmap_alloc_range(&qp_table->bitmap, cnt, align, base);
+       return hns_roce_bitmap_alloc_range(&qp_table->bitmap, cnt, align,
+                                          base) ?
+                      -ENOMEM :
+                      0;
 }
 
 enum hns_roce_qp_state to_hns_roce_state(enum ib_qp_state state)


Reply via email to