Skip to contentSkip to conversation

net/smc: Fix ENODATA tests in smc_nl_get_fback_stats()

PATCH Applied Dan Carpenter 3 participants 3 messages Jun 19, 2021 – Jun 21, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/smc: Fix ENODATA tests in smc_nl_get_fback_stats()

These functions return negative ENODATA but the minus sign was left out in the tests.

Fixes f0dd7bf5e330 ("net/smc: Add netlink support for SMC fallback statistics")
---
 net/smc/smc_stats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
net/smc/smc_stats.c +3 -3
index 614013e3b574..e80e34f7ac15 100644
@@ -393,17 +393,17 @@ int smc_nl_get_fback_stats(struct sk_buff *skb, struct netlink_callback *cb)
 			continue;
 		if (!skip_serv) {
 			rc_srv = smc_nl_get_fback_details(skb, cb, k, is_srv);
-			if (rc_srv && rc_srv != ENODATA)
+			if (rc_srv && rc_srv != -ENODATA)
 				break;
 		} else {
 			skip_serv = 0;
 		}
 		rc_clnt = smc_nl_get_fback_details(skb, cb, k, !is_srv);
-		if (rc_clnt && rc_clnt != ENODATA) {
+		if (rc_clnt && rc_clnt != -ENODATA) {
 			skip_serv = 1;
 			break;
 		}
-		if (rc_clnt == ENODATA && rc_srv == ENODATA)
+		if (rc_clnt == -ENODATA && rc_srv == -ENODATA)
 			break;
 	}
 	mutex_unlock(&net->smc.mutex_fback_rsn);
Signature · 1 line
2.30.2
Acked-by on v1 1/1
#1 lore raw
Quoted 24 lines · Dan Carpenter

These functions return negative ENODATA but the minus sign was left out in the tests.

Fixes f0dd7bf5e330 ("net/smc: Add netlink support for SMC fallback statistics")
---
  net/smc/smc_stats.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
net/smc/smc_stats.c +1 -1
index 614013e3b574..e80e34f7ac15 100644
@@ -393,17 +393,17 @@ int smc_nl_get_fback_stats(struct sk_buff *skb, struct netlink_callback *cb)
  			continue;
  		if (!skip_serv) {
  			rc_srv = smc_nl_get_fback_details(skb, cb, k, is_srv);
-			if (rc_srv && rc_srv != ENODATA)
+			if (rc_srv && rc_srv != -ENODATA)
  				break;
  		} else {
  			skip_serv = 0;
  		}
  		rc_clnt = smc_nl_get_fback_details(skb, cb, k, !is_srv);

net/smc/smc_stats.c int smc_nl_get_fback_stats(struct sk_buff *skb, struct netlink_callback *cb) · line 409

Quoted 10 lines
net/smc/smc_stats.c +2 -2
-		if (rc_clnt && rc_clnt != ENODATA) {
+		if (rc_clnt && rc_clnt != -ENODATA) {
  			skip_serv = 1;
  			break;
  		}
-		if (rc_clnt == ENODATA && rc_srv == ENODATA)
+		if (rc_clnt == -ENODATA && rc_srv == -ENODATA)
  			break;
  	}
  	mutex_unlock(&net->smc.mutex_fback_rsn);

Thanks for preparing the fix.

#2 lore raw
In reply to Dan Carpenter
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 8 lines · On Sat, 19 Jun 2021 16:50:21 +0300 you wrote:

These functions return negative ENODATA but the minus sign was left out in the tests.

Fixes f0dd7bf5e330 ("net/smc: Add netlink support for SMC fallback statistics")
---
 net/smc/smc_stats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Here is the summary with links:
- [net-next] net/smc: Fix ENODATA tests in smc_nl_get_fback_stats()

    https://git.kernel.org/netdev/net-next/c/1a1100d53f12

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html