netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled
  2013-06-14  7:29 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
@ 2013-06-14  7:29 ` junwei.zhang
  0 siblings, 0 replies; 5+ 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>

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] 5+ messages in thread

* [PATCH 1/2] kernel: remove unnecessary head file
@ 2013-06-21  2:05 junwei.zhang
  2013-06-21  2:05 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
  2013-06-21  2:14 ` [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
  0 siblings, 2 replies; 5+ 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] 5+ messages in thread

* [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled
  2013-06-21  2:05 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
@ 2013-06-21  2:05 ` junwei.zhang
  2013-06-21  2:14 ` [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
  1 sibling, 0 replies; 5+ 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>
---
 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] 5+ messages in thread

* Re: [PATCH 1/2] kernel: remove unnecessary head file
  2013-06-21  2:05 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
  2013-06-21  2:05 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
@ 2013-06-21  2:14 ` junwei.zhang
  1 sibling, 0 replies; 5+ 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] 5+ messages in thread

* [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled
  2013-06-21  2:19 junwei.zhang
@ 2013-06-21  2:19 ` junwei.zhang
  0 siblings, 0 replies; 5+ 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] 5+ messages in thread

end of thread, other threads:[~2013-06-21  2:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-21  2:05 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
2013-06-21  2:05 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang
2013-06-21  2:14 ` [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
  -- strict thread matches above, loose matches on Subject: below --
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
2013-06-14  7:29 [PATCH 1/2] kernel: remove unnecessary head file junwei.zhang
2013-06-14  7:29 ` [PATCH 2/2] netns: exclude ipvs from struct net when IPVS disabled junwei.zhang

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