Skip to contentSkip to conversation

RDMA/rtrs: client: Fix function return on success

PATCH Superseded Gustavo A. R. Silva 3 participants 3 messages May 19, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/rtrs: client: Fix function return on success

The function should return 0 on success, instead of err.

Addresses-Coverity-ID: 1493753 ("Identical code for different branches")

Fixes 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2 -1
index 468fdd0d8713c..465515e46bb1a 100644
@@ -1594,7 +1594,8 @@ static int create_con_cq_qp(struct rtrs_clt_con *con)
 
 	if (err)
 		return err;
-	return err;
+
+	return 0;
 }
 
 static void destroy_con_cq_qp(struct rtrs_clt_con *con)
Signature · 1 line
2.26.2
#1 lore raw
Quoted 14 lines · Gustavo A. R. Silva

The function should return 0 on success, instead of err.

Addresses-Coverity-ID: 1493753 ("Identical code for different branches")

Fixes 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0 -0
index 468fdd0d8713c..465515e46bb1a 100644

drivers/infiniband/ulp/rtrs/rtrs-clt.c static int create_con_cq_qp(struct rtrs_clt_con *con) · line 1599

Quoted 7 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2 -1
@@ -1594,7 +1594,8 @@ static int create_con_cq_qp(struct rtrs_clt_con *con)
 
 	if (err)
 		return err;
-	return err;
+
+	return 0;
 }

Why to keep the if-statement? Has the following been considered?

drivers/infiniband/ulp/rtrs/rtrs-clt.c +0 -2
index 8dfa56dc32bc..a7f5d55f8542 100644
@@ -1587,8 +1587,6 @@ static int create_con_cq_qp(struct rtrs_clt_con *con)
 	 * since destroy_con_cq_qp() must be called.
 	 */
 
-	if (err)
-		return err;
 	return err;
 }
 

Thanks,

Bart.

#2 lore raw
Quoted 41 lines · Bart Van Assche
Quoted 14 lines · Gustavo A. R. Silva

The function should return 0 on success, instead of err.

Addresses-Coverity-ID: 1493753 ("Identical code for different branches")

Fixes 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0 -0
index 468fdd0d8713c..465515e46bb1a 100644

drivers/infiniband/ulp/rtrs/rtrs-clt.c static int create_con_cq_qp(struct rtrs_clt_con *con) · line 1599

Quoted 7 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2 -1
@@ -1594,7 +1594,8 @@ static int create_con_cq_qp(struct rtrs_clt_con *con)
 
      if (err)
              return err;
-     return err;
+
+     return 0;
 }

Why to keep the if-statement? Has the following been considered?

drivers/infiniband/ulp/rtrs/rtrs-clt.c +0 -2
index 8dfa56dc32bc..a7f5d55f8542 100644
@@ -1587,8 +1587,6 @@ static int create_con_cq_qp(struct rtrs_clt_con *con)
         * since destroy_con_cq_qp() must be called.
         */
 
-       if (err)
-               return err;
        return err;
 }
 

Thanks,

Quoted 1 line

Bart.

This one seems better, thanks Bart and Gustavo, Gustavo, would you like to send a v2 patch as Bart suggested?

Thanks,