* [PATCH 1/2] kernel: remove unnecessary head file
@ 2013-06-21 2:19 junwei.zhang
2013-06-21 2:19 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: junwei.zhang @ 2013-06-21 2:19 UTC (permalink / raw)
To: wensong; +Cc: horms, ja, netdev, lvs-devel, JunweiZhang, Nicolas Dichtel
From: JunweiZhang <junwei.zhang@6wind.com>
ip_vs.h is not necessary for sysctl_binary.c.
prepare for the next patch to avoid compile issue.
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
kernel/sysctl_binary.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index aea4a9e..b609213 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -3,7 +3,6 @@
#include "../fs/xfs/xfs_sysctl.h"
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
-#include <net/ip_vs.h>
#include <linux/syscalls.h>
#include <linux/namei.h>
#include <linux/mount.h>
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled
2013-06-21 2:19 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
@ 2013-06-21 2:19 ` junwei.zhang
2013-06-21 6:40 ` [PATCH 1/2] kernel: remove unnecessary head file Julian Anastasov
` (2 subsequent siblings)
3 siblings, 0 replies; 13+ messages in thread
From: junwei.zhang @ 2013-06-21 2:19 UTC (permalink / raw)
To: wensong; +Cc: horms, ja, netdev, lvs-devel, JunweiZhang, Nicolas Dichtel
From: JunweiZhang <junwei.zhang@6wind.com>
no real problem is fixed, just save a few bytes in
net_namespace structure.
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
include/net/net_namespace.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index b176978..c2bf266 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -115,7 +115,9 @@ struct net {
#ifdef CONFIG_XFRM
struct netns_xfrm xfrm;
#endif
+#if IS_ENABLED(CONFIG_IP_VS)
struct netns_ipvs *ipvs;
+#endif
struct sock *diag_nlsk;
atomic_t rt_genid;
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] kernel: remove unnecessary head file
2013-06-21 2:19 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
2013-06-21 2:19 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
@ 2013-06-21 6:40 ` Julian Anastasov
2013-06-24 7:23 ` David Miller
2013-06-24 7:24 ` David Miller
3 siblings, 0 replies; 13+ messages in thread
From: Julian Anastasov @ 2013-06-21 6:40 UTC (permalink / raw)
To: JunweiZhang; +Cc: wensong, horms, netdev, lvs-devel, Nicolas Dichtel
Hello,
On Fri, 21 Jun 2013, junwei.zhang@6wind.com wrote:
> From: JunweiZhang <junwei.zhang@6wind.com>
>
> ip_vs.h is not necessary for sysctl_binary.c.
>
> prepare for the next patch to avoid compile issue.
>
> Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Both patches look good to me:
Reviewed-by: Julian Anastasov <ja@ssi.bg>
Please use version descriptor in future, for example:
[PATCHv2 ...] ...
> ---
> kernel/sysctl_binary.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
> index aea4a9e..b609213 100644
> --- a/kernel/sysctl_binary.c
> +++ b/kernel/sysctl_binary.c
> @@ -3,7 +3,6 @@
> #include "../fs/xfs/xfs_sysctl.h"
> #include <linux/sunrpc/debug.h>
> #include <linux/string.h>
> -#include <net/ip_vs.h>
> #include <linux/syscalls.h>
> #include <linux/namei.h>
> #include <linux/mount.h>
> --
> 1.8.1.2
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] kernel: remove unnecessary head file
2013-06-21 2:19 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
2013-06-21 2:19 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
2013-06-21 6:40 ` [PATCH 1/2] kernel: remove unnecessary head file Julian Anastasov
@ 2013-06-24 7:23 ` David Miller
2013-06-24 7:24 ` David Miller
3 siblings, 0 replies; 13+ messages in thread
From: David Miller @ 2013-06-24 7:23 UTC (permalink / raw)
To: junwei.zhang; +Cc: wensong, horms, ja, netdev, lvs-devel, nicolas.dichtel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] kernel: remove unnecessary head file
2013-06-21 2:19 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
` (2 preceding siblings ...)
2013-06-24 7:23 ` David Miller
@ 2013-06-24 7:24 ` David Miller
2013-06-26 8:40 ` [PATCH v2 net-next " junwei.zhang
2013-06-26 8:58 ` [PATCH " Simon Horman
3 siblings, 2 replies; 13+ messages in thread
From: David Miller @ 2013-06-24 7:24 UTC (permalink / raw)
To: junwei.zhang; +Cc: wensong, horms, ja, netdev, lvs-devel, nicolas.dichtel
These two patches do not apply to net-next.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 net-next 1/2] kernel: remove unnecessary head file
2013-06-24 7:24 ` David Miller
@ 2013-06-26 8:40 ` junwei.zhang
2013-06-26 8:40 ` [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
2013-06-26 8:59 ` [PATCH v2 net-next 1/2] kernel: remove unnecessary head file Simon Horman
2013-06-26 8:58 ` [PATCH " Simon Horman
1 sibling, 2 replies; 13+ messages in thread
From: junwei.zhang @ 2013-06-26 8:40 UTC (permalink / raw)
To: davem; +Cc: wensong, horms, ja, netdev, lvs-devel, nicolas.dichtel, JunweiZhang
From: JunweiZhang <junwei.zhang@6wind.com>
ip_vs.h is not necessary for sysctl_binary.c.
prepare for the next patch to avoid compile issue.
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: Julian Anastasov <ja@ssi.bg>
---
v2: rebase on net-next
kernel/sysctl_binary.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index aea4a9e..b609213 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -3,7 +3,6 @@
#include "../fs/xfs/xfs_sysctl.h"
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
-#include <net/ip_vs.h>
#include <linux/syscalls.h>
#include <linux/namei.h>
#include <linux/mount.h>
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled
2013-06-26 8:40 ` [PATCH v2 net-next " junwei.zhang
@ 2013-06-26 8:40 ` junwei.zhang
2013-06-26 8:59 ` Simon Horman
2013-06-26 8:59 ` [PATCH v2 net-next 1/2] kernel: remove unnecessary head file Simon Horman
1 sibling, 1 reply; 13+ messages in thread
From: junwei.zhang @ 2013-06-26 8:40 UTC (permalink / raw)
To: davem; +Cc: wensong, horms, ja, netdev, lvs-devel, nicolas.dichtel, JunweiZhang
From: JunweiZhang <junwei.zhang@6wind.com>
no real problem is fixed, just save a few bytes in
net_namespace structure.
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: Julian Anastasov <ja@ssi.bg>
---
v2: rebase on net-next
include/net/net_namespace.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 495bc57..84e37b1 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -115,7 +115,9 @@ struct net {
#ifdef CONFIG_XFRM
struct netns_xfrm xfrm;
#endif
+#if IS_ENABLED(CONFIG_IP_VS)
struct netns_ipvs *ipvs;
+#endif
struct sock *diag_nlsk;
atomic_t rt_genid;
atomic_t fnhe_genid;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] kernel: remove unnecessary head file
2013-06-24 7:24 ` David Miller
2013-06-26 8:40 ` [PATCH v2 net-next " junwei.zhang
@ 2013-06-26 8:58 ` Simon Horman
1 sibling, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-06-26 8:58 UTC (permalink / raw)
To: David Miller
Cc: junwei.zhang, wensong, ja, netdev, lvs-devel, nicolas.dichtel
On Mon, Jun 24, 2013 at 12:24:01AM -0700, David Miller wrote:
>
> These two patches do not apply to net-next.
The reposted versions seem to apply to ipvs-next.
I'll take them through there.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 net-next 1/2] kernel: remove unnecessary head file
2013-06-26 8:40 ` [PATCH v2 net-next " junwei.zhang
2013-06-26 8:40 ` [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
@ 2013-06-26 8:59 ` Simon Horman
1 sibling, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-06-26 8:59 UTC (permalink / raw)
To: junwei.zhang; +Cc: davem, wensong, ja, netdev, lvs-devel, nicolas.dichtel
On Wed, Jun 26, 2013 at 04:40:05PM +0800, junwei.zhang@6wind.com wrote:
> From: JunweiZhang <junwei.zhang@6wind.com>
>
> ip_vs.h is not necessary for sysctl_binary.c.
>
> prepare for the next patch to avoid compile issue.
>
> Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> Reviewed-by: Julian Anastasov <ja@ssi.bg>
Thanks, applied to ipvs-next.
> ---
> v2: rebase on net-next
> kernel/sysctl_binary.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
> index aea4a9e..b609213 100644
> --- a/kernel/sysctl_binary.c
> +++ b/kernel/sysctl_binary.c
> @@ -3,7 +3,6 @@
> #include "../fs/xfs/xfs_sysctl.h"
> #include <linux/sunrpc/debug.h>
> #include <linux/string.h>
> -#include <net/ip_vs.h>
> #include <linux/syscalls.h>
> #include <linux/namei.h>
> #include <linux/mount.h>
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled
2013-06-26 8:40 ` [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
@ 2013-06-26 8:59 ` Simon Horman
0 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-06-26 8:59 UTC (permalink / raw)
To: junwei.zhang; +Cc: davem, wensong, ja, netdev, lvs-devel, nicolas.dichtel
On Wed, Jun 26, 2013 at 04:40:06PM +0800, junwei.zhang@6wind.com wrote:
> From: JunweiZhang <junwei.zhang@6wind.com>
>
> no real problem is fixed, just save a few bytes in
> net_namespace structure.
>
> Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> Reviewed-by: Julian Anastasov <ja@ssi.bg>
Thanks, applied to ipvs-next.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] kernel: remove unnecessary head file
2013-06-21 2:05 junwei.zhang
@ 2013-06-21 2:14 ` junwei.zhang
0 siblings, 0 replies; 13+ messages in thread
From: junwei.zhang @ 2013-06-21 2:14 UTC (permalink / raw)
To: junwei.zhang; +Cc: wensong, horms, ja, netdev, lvs-devel
On 06/21/2013 10:05 AM, junwei.zhang@6wind.com wrote:
> From: JunweiZhang <junwei.zhang@6wind.com>
>
> Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
> ---
> kernel/sysctl_binary.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
> index aea4a9e..b609213 100644
> --- a/kernel/sysctl_binary.c
> +++ b/kernel/sysctl_binary.c
> @@ -3,7 +3,6 @@
> #include "../fs/xfs/xfs_sysctl.h"
> #include <linux/sunrpc/debug.h>
> #include <linux/string.h>
> -#include <net/ip_vs.h>
> #include <linux/syscalls.h>
> #include <linux/namei.h>
> #include <linux/mount.h>
Please ignore this series patch.
I missing some comment.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/2] kernel: remove unnecessary head file
@ 2013-06-21 2:05 junwei.zhang
2013-06-21 2:14 ` junwei.zhang
0 siblings, 1 reply; 13+ messages in thread
From: junwei.zhang @ 2013-06-21 2:05 UTC (permalink / raw)
To: wensong; +Cc: horms, ja, netdev, lvs-devel, JunweiZhang
From: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
---
kernel/sysctl_binary.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index aea4a9e..b609213 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -3,7 +3,6 @@
#include "../fs/xfs/xfs_sysctl.h"
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
-#include <net/ip_vs.h>
#include <linux/syscalls.h>
#include <linux/namei.h>
#include <linux/mount.h>
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 1/2] kernel: remove unnecessary head file
@ 2013-06-14 7:29 junwei.zhang
0 siblings, 0 replies; 13+ messages in thread
From: junwei.zhang @ 2013-06-14 7:29 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, akpm, JunweiZhang, Nicolas Dichtel
From: JunweiZhang <junwei.zhang@6wind.com>
ip_vs.h is not necessary for sysctl_binary.c.
prepare for the next patch to avoid compile issue.
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
kernel/sysctl_binary.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index aea4a9e..b609213 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -3,7 +3,6 @@
#include "../fs/xfs/xfs_sysctl.h"
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
-#include <net/ip_vs.h>
#include <linux/syscalls.h>
#include <linux/namei.h>
#include <linux/mount.h>
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-06-26 8:59 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-21 2:19 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
2013-06-21 2:19 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
2013-06-21 6:40 ` [PATCH 1/2] kernel: remove unnecessary head file Julian Anastasov
2013-06-24 7:23 ` David Miller
2013-06-24 7:24 ` David Miller
2013-06-26 8:40 ` [PATCH v2 net-next " junwei.zhang
2013-06-26 8:40 ` [PATCH v2 net-next 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
2013-06-26 8:59 ` Simon Horman
2013-06-26 8:59 ` [PATCH v2 net-next 1/2] kernel: remove unnecessary head file Simon Horman
2013-06-26 8:58 ` [PATCH " Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2013-06-21 2:05 junwei.zhang
2013-06-21 2:14 ` junwei.zhang
2013-06-14 7:29 junwei.zhang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.