diff mbox

netfilter: ipvs: avoid unused variable warning

Message ID 9616810.SPqCgIbKt5@wuerfel
State Awaiting Upstream
Delegated to: Pablo Neira
Headers show

Commit Message

Arnd Bergmann Nov. 30, 2015, 9:54 a.m. UTC
When CONFIG_PROC_FS is disabled, the local 'net' variable in
ip_vs_app_net_init becomes unused, as gcc warns:

net/netfilter/ipvs/ip_vs_app.c: In function 'ip_vs_app_net_init':
net/netfilter/ipvs/ip_vs_app.c:608:14: warning: unused variable 'net' [-Wunused-variable]

This removes the line by moving the pointer dereference into the
user of the variable.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Julian Anastasov Nov. 30, 2015, 8:48 p.m. UTC | #1
Hello,

On Mon, 30 Nov 2015, Arnd Bergmann wrote:

> When CONFIG_PROC_FS is disabled, the local 'net' variable in
> ip_vs_app_net_init becomes unused, as gcc warns:
> 
> net/netfilter/ipvs/ip_vs_app.c: In function 'ip_vs_app_net_init':
> net/netfilter/ipvs/ip_vs_app.c:608:14: warning: unused variable 'net' [-Wunused-variable]
> 
> This removes the line by moving the pointer dereference into the
> user of the variable.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Julian Anastasov <ja@ssi.bg>

> diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
> index 0328f7250693..e5422d3db501 100644
> --- a/net/netfilter/ipvs/ip_vs_app.c
> +++ b/net/netfilter/ipvs/ip_vs_app.c
> @@ -614,8 +614,6 @@ int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs)
>  
>  void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs)
>  {
> -	struct net *net = ipvs->net;
> -
>  	unregister_ip_vs_app(ipvs, NULL /* all */);
> -	remove_proc_entry("ip_vs_app", net->proc_net);
> +	remove_proc_entry("ip_vs_app", ipvs->net->proc_net);
>  }

Regards

--
Julian Anastasov <ja@ssi.bg>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Dec. 1, 2015, 7:48 a.m. UTC | #2
On Mon, Nov 30, 2015 at 10:48:34PM +0200, Julian Anastasov wrote:
> 
> 	Hello,
> 
> On Mon, 30 Nov 2015, Arnd Bergmann wrote:
> 
> > When CONFIG_PROC_FS is disabled, the local 'net' variable in
> > ip_vs_app_net_init becomes unused, as gcc warns:
> > 
> > net/netfilter/ipvs/ip_vs_app.c: In function 'ip_vs_app_net_init':
> > net/netfilter/ipvs/ip_vs_app.c:608:14: warning: unused variable 'net' [-Wunused-variable]
> > 
> > This removes the line by moving the pointer dereference into the
> > user of the variable.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> Acked-by: Julian Anastasov <ja@ssi.bg>

Thanks, applied to ipvs-next.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
index 0328f7250693..e5422d3db501 100644
--- a/net/netfilter/ipvs/ip_vs_app.c
+++ b/net/netfilter/ipvs/ip_vs_app.c
@@ -614,8 +614,6 @@  int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs)
 
 void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs)
 {
-	struct net *net = ipvs->net;
-
 	unregister_ip_vs_app(ipvs, NULL /* all */);
-	remove_proc_entry("ip_vs_app", net->proc_net);
+	remove_proc_entry("ip_vs_app", ipvs->net->proc_net);
 }