ipmr: fix build with clang and DEBUG_NET disabled.

Paolo Abeni · Paolo Abeni · commit f6d7695b5ae2 · 2024-11-28T17:40:54.000+01:00
Sasha reported a build issue in ipmr:: net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not \ needed and will not be emitted \ [-Werror,-Wunneeded-internal-declaration] 320 | static bool ipmr_can_free_table(struct net *net) Apparently clang is too smart with BUILD_BUG_ON_INVALID(), let's fallback to a plain WARN_ON_ONCE(). Reported-by: Sasha Levin <sashal@kernel.org> Closes: https://qa-reports.linaro.org/lkft/sashal-linus-next/build/v6.11-25635-g6813e2326f1e/testrun/26111580/suite/build/test/clang-nightly-lkftconfig/details/ Fixes: 11b6e70 ("ipmr: add debug check for mr table cleanup") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Link: https://patch.msgid.link/ee75faa926b2446b8302ee5fc30e129d2df73b90.1732810228.git.pabeni@redhat.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
@@ -437,7 +437,7 @@ static void ipmr_free_table(struct mr_table *mrt)
 {
 	struct net *net = read_pnet(&mrt->net);
 
-	DEBUG_NET_WARN_ON_ONCE(!ipmr_can_free_table(net));
+	WARN_ON_ONCE(!ipmr_can_free_table(net));
 
 	timer_shutdown_sync(&mrt->ipmr_expire_timer);
 	mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC |
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
@@ -416,7 +416,7 @@ static void ip6mr_free_table(struct mr_table *mrt)
 {
 	struct net *net = read_pnet(&mrt->net);
 
-	DEBUG_NET_WARN_ON_ONCE(!ip6mr_can_free_table(net));
+	WARN_ON_ONCE(!ip6mr_can_free_table(net));
 
 	timer_shutdown_sync(&mrt->ipmr_expire_timer);
 	mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC |

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ static void ipmr_free_table(struct mr_table *mrt)`
`437`	`437`	`{`
`438`	`438`	`struct net *net = read_pnet(&mrt->net);`
`439`	`439`
`440`		`- DEBUG_NET_WARN_ON_ONCE(!ipmr_can_free_table(net));`
	`440`	`+ WARN_ON_ONCE(!ipmr_can_free_table(net));`
`441`	`441`
`442`	`442`	`timer_shutdown_sync(&mrt->ipmr_expire_timer);`
`443`	`443`	`mroute_clean_tables(mrt, MRT_FLUSH_VIFS \| MRT_FLUSH_VIFS_STATIC \|`
Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ static void ip6mr_free_table(struct mr_table *mrt)`
`416`	`416`	`{`
`417`	`417`	`struct net *net = read_pnet(&mrt->net);`
`418`	`418`
`419`		`- DEBUG_NET_WARN_ON_ONCE(!ip6mr_can_free_table(net));`
	`419`	`+ WARN_ON_ONCE(!ip6mr_can_free_table(net));`
`420`	`420`
`421`	`421`	`timer_shutdown_sync(&mrt->ipmr_expire_timer);`
`422`	`422`	`mroute_clean_tables(mrt, MRT6_FLUSH_MIFS \| MRT6_FLUSH_MIFS_STATIC \|`