[PATCH] Fix compile issue with CONFIG_CHECKPOINT=n for inet sockets

[PATCH] Fix compile issue with CONFIG_CHECKPOINT=n for inet sockets

[Matt Helsley]

When I disable CHECKPOINT I get:

	net/ipv4/af_inet.c:860: error: ‘inet_checkpoint’ undeclared here (not in a function)
	net/ipv4/af_inet.c:861: error: ‘inet_restore’ undeclared here (not in a function)
	net/ipv4/af_inet.c:862: error: ‘inet_collect’ undeclared here (not in a function)

Similar to problem with unix sockets. The solution is the same as well.

Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Cc: Dan Smith <danms@us.ibm.com>
---
 include/net/inet_common.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index 7ade732..bf04e6e 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -52,6 +52,10 @@ extern int inet_checkpoint(struct ckpt_ctx *ctx, struct socket *sock);
 extern int inet_collect(struct ckpt_ctx *ctx, struct socket *sock);
 extern int inet_restore(struct ckpt_ctx *cftx, struct socket *sock,
 			struct ckpt_hdr_socket *h);
+#else
+#define inet_checkpoint NULL
+#define inet_collect NULL
+#define inet_restore NULL
 #endif /* CONFIG_CHECKPOINT */
 
 static inline void inet_ctl_sock_destroy(struct sock *sk)
-- 
1.5.6.3

_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers

Re: [PATCH] Fix compile issue with CONFIG_CHECKPOINT=n for inet sockets

[Dan Smith]

MH> Similar to problem with unix sockets. The solution is the same as well.

Indeed, sorry about that.

MH> Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

Acked-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

-- 
Dan Smith
IBM Linux Technology Center
email: danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org

Re: [PATCH] Fix compile issue with CONFIG_CHECKPOINT=n for inet sockets

[Oren Laadan]

Queued to ckpt-v18-dev.


Matt Helsley wrote:
> When I disable CHECKPOINT I get:
> 
> 	net/ipv4/af_inet.c:860: error: ‘inet_checkpoint’ undeclared here (not in a function)
> 	net/ipv4/af_inet.c:861: error: ‘inet_restore’ undeclared here (not in a function)
> 	net/ipv4/af_inet.c:862: error: ‘inet_collect’ undeclared here (not in a function)
> 
> Similar to problem with unix sockets. The solution is the same as well.
> 
> Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
> Cc: Dan Smith <danms@us.ibm.com>
> ---
>  include/net/inet_common.h |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/include/net/inet_common.h b/include/net/inet_common.h
> index 7ade732..bf04e6e 100644
> --- a/include/net/inet_common.h
> +++ b/include/net/inet_common.h
> @@ -52,6 +52,10 @@ extern int inet_checkpoint(struct ckpt_ctx *ctx, struct socket *sock);
>  extern int inet_collect(struct ckpt_ctx *ctx, struct socket *sock);
>  extern int inet_restore(struct ckpt_ctx *cftx, struct socket *sock,
>  			struct ckpt_hdr_socket *h);
> +#else
> +#define inet_checkpoint NULL
> +#define inet_collect NULL
> +#define inet_restore NULL
>  #endif /* CONFIG_CHECKPOINT */
>  
>  static inline void inet_ctl_sock_destroy(struct sock *sk)
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers

Re: [PATCH] Fix compile issue with CONFIG_CHECKPOINT=n for inet sockets

[Matt Helsley]

On Fri, Oct 02, 2009 at 06:34:35AM -0700, Dan Smith wrote:
> MH> Similar to problem with unix sockets. The solution is the same as well.
> 
> Indeed, sorry about that.

No problem. I noticed Serge testing this config earlier and thought I should
test my own patches with it again..

Cheers,
	-Matt Helsley