netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* netfilter: Use proper rwlock init function
@ 2011-10-05 13:24 Thomas Gleixner
  2011-10-05 13:54 ` Hans Schillström
  0 siblings, 1 reply; 3+ messages in thread
From: Thomas Gleixner @ 2011-10-05 13:24 UTC (permalink / raw)
  To: netdev; +Cc: David Miller

Replace the open coded initialization with the init function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 net/netfilter/ipvs/ip_vs_ctl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/net/netfilter/ipvs/ip_vs_ctl.c
===================================================================
--- linux-2.6.orig/net/netfilter/ipvs/ip_vs_ctl.c
+++ linux-2.6/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3679,7 +3679,7 @@ int __net_init __ip_vs_control_init(stru
 	int idx;
 	struct netns_ipvs *ipvs = net_ipvs(net);
 
-	ipvs->rs_lock = __RW_LOCK_UNLOCKED(ipvs->rs_lock);
+	rwlock_init(&ipvs->rs_lock);
 
 	/* Initialize rs_table */
 	for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* RE: netfilter: Use proper rwlock init function
  2011-10-05 13:24 netfilter: Use proper rwlock init function Thomas Gleixner
@ 2011-10-05 13:54 ` Hans Schillström
  2011-10-05 21:51   ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Hans Schillström @ 2011-10-05 13:54 UTC (permalink / raw)
  To: Thomas Gleixner, netdev@vger.kernel.org, Julian Anastasov,
	horms@verge.net.au
  Cc: David Miller

Hello Simon,
you can drop my "fix lockdep warning" patch
since Thomas patch is identical to what I prepared to send...

>Replace the open coded initialization with the init function.
>
>Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Ack-by: Hans Schillstrom <hans.schillstrom@ericsson.com>

>---
> net/netfilter/ipvs/ip_vs_ctl.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>Index: linux-2.6/net/netfilter/ipvs/ip_vs_ctl.c
>===================================================================
>--- linux-2.6.orig/net/netfilter/ipvs/ip_vs_ctl.c
>+++ linux-2.6/net/netfilter/ipvs/ip_vs_ctl.c
>@@ -3679,7 +3679,7 @@ int __net_init __ip_vs_control_init(stru
>        int idx;
>        struct netns_ipvs *ipvs = net_ipvs(net);
>
>-       ipvs->rs_lock = __RW_LOCK_UNLOCKED(ipvs->rs_lock);
>+       rwlock_init(&ipvs->rs_lock);
>
>        /* Initialize rs_table */
>        for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++)

Thanks
Hans

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: netfilter: Use proper rwlock init function
  2011-10-05 13:54 ` Hans Schillström
@ 2011-10-05 21:51   ` David Miller
  0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2011-10-05 21:51 UTC (permalink / raw)
  To: hans.schillstrom; +Cc: tglx, netdev, ja, horms

From: Hans Schillström <hans.schillstrom@ericsson.com>
Date: Wed, 5 Oct 2011 15:54:07 +0200

> Hello Simon,
> you can drop my "fix lockdep warning" patch
> since Thomas patch is identical to what I prepared to send...
> 
>>Replace the open coded initialization with the init function.
>>
>>Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> Ack-by: Hans Schillstrom <hans.schillstrom@ericsson.com>

[ It's "Acked-by" btw...]

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-10-05 21:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-05 13:24 netfilter: Use proper rwlock init function Thomas Gleixner
2011-10-05 13:54 ` Hans Schillström
2011-10-05 21:51   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).