LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
@ 2011-02-01  0:14 Simon Horman
  2011-02-01  0:14 ` [PATCH 1/4] IPVS: use z modifier for sizeof() argument Simon Horman
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Simon Horman @ 2011-02-01  0:14 UTC (permalink / raw)
  To: netdev, linux-next, linux-kernel, lvs-devel
  Cc: Randy Dunlap, Stephen Rothwell, Hans Schillstrom, Patrick McHardy

Hi,

This short patch series addresses two linux-next build problems
raised by Randy Dunlap:

* net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
* ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
  ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!

The remainder of the changset is cleanups that I noticed along the way.

The changes are available at
git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git master

They are currently compile-tested only.

 include/net/ip_vs.h              |    2 --
 net/netfilter/ipvs/ip_vs_core.c  |    2 +-
 net/netfilter/ipvs/ip_vs_ctl.c   |   17 +++++++++--------
 net/netfilter/ipvs/ip_vs_lblc.c  |   20 ++++++++++----------
 net/netfilter/ipvs/ip_vs_lblcr.c |   20 ++++++++++----------
 5 files changed, 30 insertions(+), 31 deletions(-)

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

* [PATCH 1/4] IPVS: use z modifier for sizeof() argument
  2011-02-01  0:14 [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Simon Horman
@ 2011-02-01  0:14 ` Simon Horman
  2011-02-01  0:14 ` [PATCH 2/4] IPVS: remove duplicate initialisation or rs_table Simon Horman
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2011-02-01  0:14 UTC (permalink / raw)
  To: netdev, linux-next, linux-kernel, lvs-devel
  Cc: Randy Dunlap, Stephen Rothwell, Hans Schillstrom,
	Patrick McHardy, Simon Horman

Cc: Hans Schillstrom <hans@schillstrom.com>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index d889f4f..4d06617 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1887,7 +1887,7 @@ static int __net_init __ip_vs_init(struct net *net)
 	ipvs->gen = atomic_read(&ipvs_netns_cnt);
 	atomic_inc(&ipvs_netns_cnt);
 	net->ipvs = ipvs;
-	printk(KERN_INFO "IPVS: Creating netns size=%lu id=%d\n",
+	printk(KERN_INFO "IPVS: Creating netns size=%zu id=%d\n",
 			 sizeof(struct netns_ipvs), ipvs->gen);
 	return 0;
 }
-- 
1.7.2.3


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

* [PATCH 2/4] IPVS: remove duplicate initialisation or rs_table
  2011-02-01  0:14 [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Simon Horman
  2011-02-01  0:14 ` [PATCH 1/4] IPVS: use z modifier for sizeof() argument Simon Horman
@ 2011-02-01  0:14 ` Simon Horman
  2011-02-01  0:14 ` [PATCH 3/4] IPVS: Remove unused variables Simon Horman
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2011-02-01  0:14 UTC (permalink / raw)
  To: netdev, linux-next, linux-kernel, lvs-devel
  Cc: Randy Dunlap, Stephen Rothwell, Hans Schillstrom,
	Patrick McHardy, Simon Horman

Cc: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_ctl.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 98df59a..d7c2fa8 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3515,9 +3515,6 @@ int __net_init __ip_vs_control_init(struct net *net)
 	}
 	spin_lock_init(&ipvs->tot_stats->lock);
 
-	for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++)
-		INIT_LIST_HEAD(&ipvs->rs_table[idx]);
-
 	proc_net_fops_create(net, "ip_vs", 0, &ip_vs_info_fops);
 	proc_net_fops_create(net, "ip_vs_stats", 0, &ip_vs_stats_fops);
 	proc_net_fops_create(net, "ip_vs_stats_percpu", 0,
-- 
1.7.2.3


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

* [PATCH 3/4] IPVS: Remove unused variables
  2011-02-01  0:14 [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Simon Horman
  2011-02-01  0:14 ` [PATCH 1/4] IPVS: use z modifier for sizeof() argument Simon Horman
  2011-02-01  0:14 ` [PATCH 2/4] IPVS: remove duplicate initialisation or rs_table Simon Horman
@ 2011-02-01  0:14 ` Simon Horman
  2011-02-01  0:14 ` [PATCH 4/4] IPVS: Allow compilation with CONFIG_SYSCTL disabled Simon Horman
  2011-02-01  0:50 ` [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Randy Dunlap
  4 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2011-02-01  0:14 UTC (permalink / raw)
  To: netdev, linux-next, linux-kernel, lvs-devel
  Cc: Randy Dunlap, Stephen Rothwell, Hans Schillstrom,
	Patrick McHardy, Simon Horman

These variables are unused as a result of the recent netns work.

Cc: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 include/net/ip_vs.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index b23bea6..5d75fea 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1109,8 +1109,6 @@ extern int ip_vs_icmp_xmit_v6
  *	we are loaded. Just set ip_vs_drop_rate to 'n' and
  *	we start to drop 1/rate of the packets
  */
-extern int ip_vs_drop_rate;
-extern int ip_vs_drop_counter;
 
 static inline int ip_vs_todrop(struct netns_ipvs *ipvs)
 {
-- 
1.7.2.3


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

* [PATCH 4/4] IPVS: Allow compilation with CONFIG_SYSCTL disabled
  2011-02-01  0:14 [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Simon Horman
                   ` (2 preceding siblings ...)
  2011-02-01  0:14 ` [PATCH 3/4] IPVS: Remove unused variables Simon Horman
@ 2011-02-01  0:14 ` Simon Horman
  2011-02-01  0:50 ` [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Randy Dunlap
  4 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2011-02-01  0:14 UTC (permalink / raw)
  To: netdev, linux-next, linux-kernel, lvs-devel
  Cc: Randy Dunlap, Stephen Rothwell, Hans Schillstrom,
	Patrick McHardy, Simon Horman

This is a rather naieve approach to allowing PVS to compile with
CONFIG_SYSCTL disabled.  I am working on a more comprehensive patch which
will remove compilation of all sysctl-related IPVS code when CONFIG_SYSCTL
is disabled.

Cc: Hans Schillstrom <hans@schillstrom.com>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_ctl.c   |   14 +++++++++-----
 net/netfilter/ipvs/ip_vs_lblc.c  |   20 ++++++++++----------
 net/netfilter/ipvs/ip_vs_lblcr.c |   20 ++++++++++----------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index d7c2fa8..c73b0c8 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3552,10 +3552,15 @@ int __net_init __ip_vs_control_init(struct net *net)
 	tbl[idx++].data = &ipvs->sysctl_nat_icmp_send;
 
 
+#ifdef CONFIG_SYSCTL
 	ipvs->sysctl_hdr = register_net_sysctl_table(net, net_vs_ctl_path,
 						     tbl);
-	if (ipvs->sysctl_hdr == NULL)
-		goto err_reg;
+	if (ipvs->sysctl_hdr == NULL) {
+		if (!net_eq(net, &init_net))
+			kfree(tbl);
+		goto err_dup;
+	}
+#endif
 	ip_vs_new_estimator(net, ipvs->tot_stats);
 	ipvs->sysctl_tbl = tbl;
 	/* Schedule defense work */
@@ -3563,9 +3568,6 @@ int __net_init __ip_vs_control_init(struct net *net)
 	schedule_delayed_work(&ipvs->defense_work, DEFENSE_TIMER_PERIOD);
 	return 0;
 
-err_reg:
-	if (!net_eq(net, &init_net))
-		kfree(tbl);
 err_dup:
 	free_percpu(ipvs->cpustats);
 err_alloc:
@@ -3581,7 +3583,9 @@ static void __net_exit __ip_vs_control_cleanup(struct net *net)
 	ip_vs_kill_estimator(net, ipvs->tot_stats);
 	cancel_delayed_work_sync(&ipvs->defense_work);
 	cancel_work_sync(&ipvs->defense_work.work);
+#ifdef CONFIG_SYSCTL
 	unregister_net_sysctl_table(ipvs->sysctl_hdr);
+#endif
 	proc_net_remove(net, "ip_vs_stats_percpu");
 	proc_net_remove(net, "ip_vs_stats");
 	proc_net_remove(net, "ip_vs");
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index d5bec33..00b5ffa 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -554,33 +554,33 @@ static int __net_init __ip_vs_lblc_init(struct net *net)
 						sizeof(vs_vars_table),
 						GFP_KERNEL);
 		if (ipvs->lblc_ctl_table == NULL)
-			goto err_dup;
+			return -ENOMEM;
 	} else
 		ipvs->lblc_ctl_table = vs_vars_table;
 	ipvs->sysctl_lblc_expiration = 24*60*60*HZ;
 	ipvs->lblc_ctl_table[0].data = &ipvs->sysctl_lblc_expiration;
 
+#ifdef CONFIG_SYSCTL
 	ipvs->lblc_ctl_header =
 		register_net_sysctl_table(net, net_vs_ctl_path,
 					  ipvs->lblc_ctl_table);
-	if (!ipvs->lblc_ctl_header)
-		goto err_reg;
+	if (!ipvs->lblc_ctl_header) {
+		if (!net_eq(net, &init_net))
+			kfree(ipvs->lblc_ctl_table);
+		return -ENOMEM;
+	}
+#endif
 
 	return 0;
-
-err_reg:
-	if (!net_eq(net, &init_net))
-		kfree(ipvs->lblc_ctl_table);
-
-err_dup:
-	return -ENOMEM;
 }
 
 static void __net_exit __ip_vs_lblc_exit(struct net *net)
 {
 	struct netns_ipvs *ipvs = net_ipvs(net);
 
+#ifdef CONFIG_SYSCTL
 	unregister_net_sysctl_table(ipvs->lblc_ctl_header);
+#endif
 
 	if (!net_eq(net, &init_net))
 		kfree(ipvs->lblc_ctl_table);
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 61ae8cf..bfa25f1 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -754,33 +754,33 @@ static int __net_init __ip_vs_lblcr_init(struct net *net)
 						sizeof(vs_vars_table),
 						GFP_KERNEL);
 		if (ipvs->lblcr_ctl_table == NULL)
-			goto err_dup;
+			return -ENOMEM;
 	} else
 		ipvs->lblcr_ctl_table = vs_vars_table;
 	ipvs->sysctl_lblcr_expiration = 24*60*60*HZ;
 	ipvs->lblcr_ctl_table[0].data = &ipvs->sysctl_lblcr_expiration;
 
+#ifdef CONFIG_SYSCTL
 	ipvs->lblcr_ctl_header =
 		register_net_sysctl_table(net, net_vs_ctl_path,
 					  ipvs->lblcr_ctl_table);
-	if (!ipvs->lblcr_ctl_header)
-		goto err_reg;
+	if (!ipvs->lblcr_ctl_header) {
+		if (!net_eq(net, &init_net))
+			kfree(ipvs->lblcr_ctl_table);
+		return -ENOMEM;
+	}
+#endif
 
 	return 0;
-
-err_reg:
-	if (!net_eq(net, &init_net))
-		kfree(ipvs->lblcr_ctl_table);
-
-err_dup:
-	return -ENOMEM;
 }
 
 static void __net_exit __ip_vs_lblcr_exit(struct net *net)
 {
 	struct netns_ipvs *ipvs = net_ipvs(net);
 
+#ifdef CONFIG_SYSCTL
 	unregister_net_sysctl_table(ipvs->lblcr_ctl_header);
+#endif
 
 	if (!net_eq(net, &init_net))
 		kfree(ipvs->lblcr_ctl_table);
-- 
1.7.2.3


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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-01  0:14 [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Simon Horman
                   ` (3 preceding siblings ...)
  2011-02-01  0:14 ` [PATCH 4/4] IPVS: Allow compilation with CONFIG_SYSCTL disabled Simon Horman
@ 2011-02-01  0:50 ` Randy Dunlap
  2011-02-01  4:06   ` Simon Horman
  4 siblings, 1 reply; 12+ messages in thread
From: Randy Dunlap @ 2011-02-01  0:50 UTC (permalink / raw)
  To: Simon Horman
  Cc: netdev, linux-next, linux-kernel, lvs-devel, Randy Dunlap,
	Stephen Rothwell, Hans Schillstrom, Patrick McHardy

On Tue,  1 Feb 2011 11:14:11 +1100 Simon Horman wrote:

> Hi,
> 
> This short patch series addresses two linux-next build problems
> raised by Randy Dunlap:
> 
> * net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
> * ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
>   ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
> 
> The remainder of the changset is cleanups that I noticed along the way.

These 4 patches build successfully for me.
However, I do see these warnings (sorry I missed them earlier):

WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()


Thanks for the patch series.

> The changes are available at
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git master
> 
> They are currently compile-tested only.
> 
>  include/net/ip_vs.h              |    2 --
>  net/netfilter/ipvs/ip_vs_core.c  |    2 +-
>  net/netfilter/ipvs/ip_vs_ctl.c   |   17 +++++++++--------
>  net/netfilter/ipvs/ip_vs_lblc.c  |   20 ++++++++++----------
>  net/netfilter/ipvs/ip_vs_lblcr.c |   20 ++++++++++----------
>  5 files changed, 30 insertions(+), 31 deletions(-)


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-01  0:50 ` [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Randy Dunlap
@ 2011-02-01  4:06   ` Simon Horman
  2011-02-01 10:04     ` Simon Horman
  0 siblings, 1 reply; 12+ messages in thread
From: Simon Horman @ 2011-02-01  4:06 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: netdev, linux-next, linux-kernel, lvs-devel, Stephen Rothwell,
	Hans Schillstrom, Patrick McHardy

On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
> On Tue,  1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
> 
> > Hi,
> > 
> > This short patch series addresses two linux-next build problems
> > raised by Randy Dunlap:
> > 
> > * net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
> > * ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
> >   ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
> > 
> > The remainder of the changset is cleanups that I noticed along the way.
> 
> These 4 patches build successfully for me.
> However, I do see these warnings (sorry I missed them earlier):
> 
> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()

Thanks, I'll look into that. I will be travelling for a good portion of the
next day and a bit so I apologise in advance if that delays my next patch.

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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-01  4:06   ` Simon Horman
@ 2011-02-01 10:04     ` Simon Horman
  2011-02-01 17:05       ` Randy Dunlap
  0 siblings, 1 reply; 12+ messages in thread
From: Simon Horman @ 2011-02-01 10:04 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: netdev, linux-next, linux-kernel, lvs-devel, Stephen Rothwell,
	Hans Schillstrom, Patrick McHardy

On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
> On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
> > On Tue,  1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
> > 
> > > Hi,
> > > 
> > > This short patch series addresses two linux-next build problems
> > > raised by Randy Dunlap:
> > > 
> > > * net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
> > > * ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
> > >   ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
> > > 
> > > The remainder of the changset is cleanups that I noticed along the way.
> > 
> > These 4 patches build successfully for me.
> > However, I do see these warnings (sorry I missed them earlier):
> > 
> > WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
> > WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
> 
> Thanks, I'll look into that. I will be travelling for a good portion of the
> next day and a bit so I apologise in advance if that delays my next patch.

Hi,

I the following patch seems to be the right fix for this to me.
I will send an amended pull request.

IPVS: Remove ip_vs_sync_cleanup from section __exit

ip_vs_sync_cleanup() may be called from ip_vs_init() on error
and thus needs to be accesible from section __init

Reporte-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_sync.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index d5a6e64..2a2a836 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1686,7 +1686,7 @@ int __init ip_vs_sync_init(void)
 	return register_pernet_subsys(&ipvs_sync_ops);
 }
 
-void __exit ip_vs_sync_cleanup(void)
+void ip_vs_sync_cleanup(void)
 {
 	unregister_pernet_subsys(&ipvs_sync_ops);
 }
-- 
1.7.2.3



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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-01 10:04     ` Simon Horman
@ 2011-02-01 17:05       ` Randy Dunlap
  2011-02-01 17:19         ` Patrick McHardy
  0 siblings, 1 reply; 12+ messages in thread
From: Randy Dunlap @ 2011-02-01 17:05 UTC (permalink / raw)
  To: Simon Horman
  Cc: netdev, linux-next, linux-kernel, lvs-devel, Stephen Rothwell,
	Hans Schillstrom, Patrick McHardy

On 02/01/11 02:04, Simon Horman wrote:
> On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
>> On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
>>> On Tue,  1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
>>>
>>>> Hi,
>>>>
>>>> This short patch series addresses two linux-next build problems
>>>> raised by Randy Dunlap:
>>>>
>>>> * net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
>>>> * ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
>>>>   ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
>>>>
>>>> The remainder of the changset is cleanups that I noticed along the way.
>>>
>>> These 4 patches build successfully for me.
>>> However, I do see these warnings (sorry I missed them earlier):
>>>
>>> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
>>> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
>>
>> Thanks, I'll look into that. I will be travelling for a good portion of the
>> next day and a bit so I apologise in advance if that delays my next patch.
> 
> Hi,
> 
> I the following patch seems to be the right fix for this to me.
> I will send an amended pull request.
> 
> IPVS: Remove ip_vs_sync_cleanup from section __exit
> 
> ip_vs_sync_cleanup() may be called from ip_vs_init() on error
> and thus needs to be accesible from section __init
> 
> Reporte-by: Randy Dunlap <randy.dunlap@oracle.com>
  Reported-by:

> Signed-off-by: Simon Horman <horms@verge.net.au>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks.

> ---
>  net/netfilter/ipvs/ip_vs_sync.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index d5a6e64..2a2a836 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -1686,7 +1686,7 @@ int __init ip_vs_sync_init(void)
>  	return register_pernet_subsys(&ipvs_sync_ops);
>  }
>  
> -void __exit ip_vs_sync_cleanup(void)
> +void ip_vs_sync_cleanup(void)
>  {
>  	unregister_pernet_subsys(&ipvs_sync_ops);
>  }


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-01 17:05       ` Randy Dunlap
@ 2011-02-01 17:19         ` Patrick McHardy
  2011-02-02 21:39           ` Simon Horman
  0 siblings, 1 reply; 12+ messages in thread
From: Patrick McHardy @ 2011-02-01 17:19 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Simon Horman, netdev, linux-next, linux-kernel, lvs-devel,
	Stephen Rothwell, Hans Schillstrom

Am 01.02.2011 18:05, schrieb Randy Dunlap:
> On 02/01/11 02:04, Simon Horman wrote:
>> On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
>>> On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
>>>> On Tue,  1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
>>>>
>>>>> Hi,
>>>>>
>>>>> This short patch series addresses two linux-next build problems
>>>>> raised by Randy Dunlap:
>>>>>
>>>>> * net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
>>>>> * ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
>>>>>   ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
>>>>>
>>>>> The remainder of the changset is cleanups that I noticed along the way.
>>>>
>>>> These 4 patches build successfully for me.
>>>> However, I do see these warnings (sorry I missed them earlier):
>>>>
>>>> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
>>>> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
>>>
>>> Thanks, I'll look into that. I will be travelling for a good portion of the
>>> next day and a bit so I apologise in advance if that delays my next patch.
>>
>> Hi,
>>
>> I the following patch seems to be the right fix for this to me.
>> I will send an amended pull request.
>>
>> IPVS: Remove ip_vs_sync_cleanup from section __exit
>>
>> ip_vs_sync_cleanup() may be called from ip_vs_init() on error
>> and thus needs to be accesible from section __init
>>
>> Reporte-by: Randy Dunlap <randy.dunlap@oracle.com>
>   Reported-by:
> 
>> Signed-off-by: Simon Horman <horms@verge.net.au>
> 
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks, since Simon is travelling, I'll apply the patches now
with your and Hans's Acks and will push them to Dave later.

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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-01 17:19         ` Patrick McHardy
@ 2011-02-02 21:39           ` Simon Horman
  2011-02-02 23:02             ` Patrick McHardy
  0 siblings, 1 reply; 12+ messages in thread
From: Simon Horman @ 2011-02-02 21:39 UTC (permalink / raw)
  To: Patrick McHardy
  Cc: Randy Dunlap, netdev, linux-next, linux-kernel, lvs-devel,
	Stephen Rothwell, Hans Schillstrom

On Tue, Feb 01, 2011 at 06:19:56PM +0100, Patrick McHardy wrote:
> Am 01.02.2011 18:05, schrieb Randy Dunlap:
> > On 02/01/11 02:04, Simon Horman wrote:
> >> On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
> >>> On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
> >>>> On Tue,  1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
> >>>>
> >>>>> Hi,
> >>>>>
> >>>>> This short patch series addresses two linux-next build problems
> >>>>> raised by Randy Dunlap:
> >>>>>
> >>>>> * net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
> >>>>> * ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko]
> >>>>>   ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
> >>>>>
> >>>>> The remainder of the changset is cleanups that I noticed along the way.
> >>>>
> >>>> These 4 patches build successfully for me.
> >>>> However, I do see these warnings (sorry I missed them earlier):
> >>>>
> >>>> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
> >>>> WARNING: net/netfilter/ipvs/ip_vs.o(.init.text+0x161): Section mismatch in reference from the function init_module() to the function .exit.text:ip_vs_sync_cleanup()
> >>>
> >>> Thanks, I'll look into that. I will be travelling for a good portion of the
> >>> next day and a bit so I apologise in advance if that delays my next patch.
> >>
> >> Hi,
> >>
> >> I the following patch seems to be the right fix for this to me.
> >> I will send an amended pull request.
> >>
> >> IPVS: Remove ip_vs_sync_cleanup from section __exit
> >>
> >> ip_vs_sync_cleanup() may be called from ip_vs_init() on error
> >> and thus needs to be accesible from section __init
> >>
> >> Reporte-by: Randy Dunlap <randy.dunlap@oracle.com>
> >   Reported-by:
> > 
> >> Signed-off-by: Simon Horman <horms@verge.net.au>
> > 
> > Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Thanks, since Simon is travelling, I'll apply the patches now
> with your and Hans's Acks and will push them to Dave later.

Thanks, I've finished travelling now :-)

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

* Re: [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups
  2011-02-02 21:39           ` Simon Horman
@ 2011-02-02 23:02             ` Patrick McHardy
  0 siblings, 0 replies; 12+ messages in thread
From: Patrick McHardy @ 2011-02-02 23:02 UTC (permalink / raw)
  To: Simon Horman
  Cc: Randy Dunlap, netdev, linux-next, linux-kernel, lvs-devel,
	Stephen Rothwell, Hans Schillstrom

Am 02.02.2011 22:39, schrieb Simon Horman:
> On Tue, Feb 01, 2011 at 06:19:56PM +0100, Patrick McHardy wrote:
>> Thanks, since Simon is travelling, I'll apply the patches now
>> with your and Hans's Acks and will push them to Dave later.
> 
> Thanks, I've finished travelling now :-)
> 

The patches got delayed a bit due to a build error in nf-next,
but I'll send them to Dave shortly.

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

end of thread, other threads:[~2011-02-02 23:02 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-01  0:14 [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Simon Horman
2011-02-01  0:14 ` [PATCH 1/4] IPVS: use z modifier for sizeof() argument Simon Horman
2011-02-01  0:14 ` [PATCH 2/4] IPVS: remove duplicate initialisation or rs_table Simon Horman
2011-02-01  0:14 ` [PATCH 3/4] IPVS: Remove unused variables Simon Horman
2011-02-01  0:14 ` [PATCH 4/4] IPVS: Allow compilation with CONFIG_SYSCTL disabled Simon Horman
2011-02-01  0:50 ` [GIT PULL nf-next-2.6] IPVS build fixes and clean-ups Randy Dunlap
2011-02-01  4:06   ` Simon Horman
2011-02-01 10:04     ` Simon Horman
2011-02-01 17:05       ` Randy Dunlap
2011-02-01 17:19         ` Patrick McHardy
2011-02-02 21:39           ` Simon Horman
2011-02-02 23:02             ` Patrick McHardy

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).