* [PATCH net-next] net: smc: fix different types in min()
@ 2022-03-01 22:24 Jakub Kicinski
2022-03-02 0:50 ` patchwork-bot+netdevbpf
2022-03-02 1:44 ` dust.li
0 siblings, 2 replies; 3+ messages in thread
From: Jakub Kicinski @ 2022-03-01 22:24 UTC (permalink / raw)
To: davem; +Cc: netdev, Dust Li, Jakub Kicinski
Fix build:
include/linux/minmax.h:45:25: note: in expansion of macro ‘__careful_cmp’
45 | #define min(x, y) __careful_cmp(x, y, <)
| ^~~~~~~~~~~~~
net/smc/smc_tx.c:150:24: note: in expansion of macro ‘min’
150 | corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size,
| ^~~
Fixes: 12bbb0d163a9 ("net/smc: add sysctl for autocorking")
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
net/smc/smc_tx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index 257dc0d0aeb1..98ca9229fe87 100644
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -147,8 +147,8 @@ static bool smc_should_autocork(struct smc_sock *smc)
struct smc_connection *conn = &smc->conn;
int corking_size;
- corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size,
- conn->sndbuf_desc->len >> 1);
+ corking_size = min_t(unsigned int, conn->sndbuf_desc->len >> 1,
+ sock_net(&smc->sk)->smc.sysctl_autocorking_size);
if (atomic_read(&conn->cdc_pend_tx_wr) == 0 ||
smc_tx_prepared_sends(conn) > corking_size)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: smc: fix different types in min()
2022-03-01 22:24 [PATCH net-next] net: smc: fix different types in min() Jakub Kicinski
@ 2022-03-02 0:50 ` patchwork-bot+netdevbpf
2022-03-02 1:44 ` dust.li
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-03-02 0:50 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, netdev, dust.li
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel•org>:
On Tue, 1 Mar 2022 14:24:46 -0800 you wrote:
> Fix build:
>
> include/linux/minmax.h:45:25: note: in expansion of macro ‘__careful_cmp’
> 45 | #define min(x, y) __careful_cmp(x, y, <)
> | ^~~~~~~~~~~~~
> net/smc/smc_tx.c:150:24: note: in expansion of macro ‘min’
> 150 | corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size,
> | ^~~
>
> [...]
Here is the summary with links:
- [net-next] net: smc: fix different types in min()
https://git.kernel.org/netdev/net-next/c/ef739f1dd3ac
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: smc: fix different types in min()
2022-03-01 22:24 [PATCH net-next] net: smc: fix different types in min() Jakub Kicinski
2022-03-02 0:50 ` patchwork-bot+netdevbpf
@ 2022-03-02 1:44 ` dust.li
1 sibling, 0 replies; 3+ messages in thread
From: dust.li @ 2022-03-02 1:44 UTC (permalink / raw)
To: Jakub Kicinski, davem; +Cc: netdev
On Tue, Mar 01, 2022 at 02:24:46PM -0800, Jakub Kicinski wrote:
>Fix build:
>
> include/linux/minmax.h:45:25: note: in expansion of macro ‘__careful_cmp’
> 45 | #define min(x, y) __careful_cmp(x, y, <)
> | ^~~~~~~~~~~~~
> net/smc/smc_tx.c:150:24: note: in expansion of macro ‘min’
> 150 | corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size,
> | ^~~
Really sorry for the break and thanks for the fix !
I found my compiler didn't complain about this, I will try to fix my
development environment.
>
>Fixes: 12bbb0d163a9 ("net/smc: add sysctl for autocorking")
>Signed-off-by: Jakub Kicinski <kuba@kernel•org>
>---
> net/smc/smc_tx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
>index 257dc0d0aeb1..98ca9229fe87 100644
>--- a/net/smc/smc_tx.c
>+++ b/net/smc/smc_tx.c
>@@ -147,8 +147,8 @@ static bool smc_should_autocork(struct smc_sock *smc)
> struct smc_connection *conn = &smc->conn;
> int corking_size;
>
>- corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size,
>- conn->sndbuf_desc->len >> 1);
>+ corking_size = min_t(unsigned int, conn->sndbuf_desc->len >> 1,
>+ sock_net(&smc->sk)->smc.sysctl_autocorking_size);
>
> if (atomic_read(&conn->cdc_pend_tx_wr) == 0 ||
> smc_tx_prepared_sends(conn) > corking_size)
>--
>2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-02 1:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-01 22:24 [PATCH net-next] net: smc: fix different types in min() Jakub Kicinski
2022-03-02 0:50 ` patchwork-bot+netdevbpf
2022-03-02 1:44 ` dust.li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox