From: Simon Horman <horms@verge.net.au> Date: 2011-02-01 00:14:26
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(-)
@@ -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,
From: Simon Horman <horms@verge.net.au> Date: 2011-02-01 00:14:31
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 <redacted>
Reported-by: Randy Dunlap <redacted>
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(-)
@@ -3552,10 +3552,15 @@ int __net_init __ip_vs_control_init(struct net *net)tbl[idx++].data=&ipvs->sysctl_nat_icmp_send;+#ifdef CONFIG_SYSCTLipvs->sysctl_hdr=register_net_sysctl_table(net,net_vs_ctl_path,tbl);-if(ipvs->sysctl_hdr==NULL)-gotoerr_reg;+if(ipvs->sysctl_hdr==NULL){+if(!net_eq(net,&init_net))+kfree(tbl);+gotoerr_dup;+}+#endifip_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);return0;-err_reg:-if(!net_eq(net,&init_net))-kfree(tbl);err_dup:free_percpu(ipvs->cpustats);err_alloc:
From: Simon Horman <horms@verge.net.au> Date: 2011-02-01 00:14:31
These variables are unused as a result of the recent netns work.
Cc: Hans Schillstrom <redacted>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
include/net/ip_vs.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
From: Randy Dunlap <hidden> Date: 2011-02-01 00:51:59
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 ***
From: Simon Horman <horms@verge.net.au> Date: 2011-02-01 04:06:42
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:
quoted
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.
From: Simon Horman <horms@verge.net.au> Date: 2011-02-01 10:04:27
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:
quoted
On Tue, 1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
quoted
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 [off-list ref]
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_sync.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
From: Randy Dunlap <hidden> Date: 2011-02-01 17:06:28
On 02/01/11 02:04, Simon Horman wrote:
On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
quoted
On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
quoted
On Tue, 1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
quoted
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 [off-list ref]
From: Patrick McHardy <hidden> Date: 2011-02-01 17:19:59
Am 01.02.2011 18:05, schrieb Randy Dunlap:
On 02/01/11 02:04, Simon Horman wrote:
quoted
On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
quoted
On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
quoted
On Tue, 1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
quoted
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 [off-list ref]
Reported-by:
quoted
Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Randy Dunlap <redacted>
Thanks, since Simon is travelling, I'll apply the patches now
with your and Hans's Acks and will push them to Dave later.
From: Simon Horman <horms@verge.net.au> Date: 2011-02-02 21:39:14
On Tue, Feb 01, 2011 at 06:19:56PM +0100, Patrick McHardy wrote:
Am 01.02.2011 18:05, schrieb Randy Dunlap:
quoted
On 02/01/11 02:04, Simon Horman wrote:
quoted
On Tue, Feb 01, 2011 at 03:06:37PM +1100, Simon Horman wrote:
quoted
On Mon, Jan 31, 2011 at 04:50:09PM -0800, Randy Dunlap wrote:
quoted
On Tue, 1 Feb 2011 11:14:11 +1100 Simon Horman wrote:
quoted
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 [off-list ref]
Reported-by:
quoted
Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Randy Dunlap <redacted>
Thanks, since Simon is travelling, I'll apply the patches now
with your and Hans's Acks and will push them to Dave later.