[PATCH 1/1] checkpoint_sem trivialities

[PATCH 1/1] checkpoint_sem trivialities

[Serge E. Hallyn]

fix a typo in a comment

rather than #include msg.h just so util.h doesn't break on struct msg_msg,
just fwd-declare it.  Probably should be fixed in util.h itself?

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 ipc/checkpoint_sem.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipc/checkpoint_sem.c b/ipc/checkpoint_sem.c
index e6934dc..19e9402 100644
--- a/ipc/checkpoint_sem.c
+++ b/ipc/checkpoint_sem.c
@@ -19,7 +19,7 @@
 #include <linux/nsproxy.h>
 #include <linux/ipc_namespace.h>
 
-#include <linux/msg.h>	/* needed for util.h that uses 'struct msg_msg' */
+struct msg_msg;
 #include "util.h"
 
 #include <linux/checkpoint.h>
@@ -192,7 +192,7 @@ int restore_ipc_sem(struct ckpt_ctx *ctx)
 	ckpt_debug("sem: do_semget key %d flag %#x id %d\n",
 		 h->perms.key, semflag, h->perms.id);
 	ret = do_semget(h->perms.key, h->sem_nsems, semflag, h->perms.id);
-	ckpt_debug("sem: do_msgget ret %d\n", ret);
+	ckpt_debug("sem: do_semget ret %d\n", ret);
 	if (ret < 0)
 		goto out;
 
-- 
1.6.1

Re: [PATCH 1/1] checkpoint_sem trivialities

[Oren Laadan]

Applied.

Serge E. Hallyn wrote:
> fix a typo in a comment
> 
> rather than #include msg.h just so util.h doesn't break on struct msg_msg,
> just fwd-declare it.  Probably should be fixed in util.h itself?
> 
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  ipc/checkpoint_sem.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ipc/checkpoint_sem.c b/ipc/checkpoint_sem.c
> index e6934dc..19e9402 100644
> --- a/ipc/checkpoint_sem.c
> +++ b/ipc/checkpoint_sem.c
> @@ -19,7 +19,7 @@
>  #include <linux/nsproxy.h>
>  #include <linux/ipc_namespace.h>
>  
> -#include <linux/msg.h>	/* needed for util.h that uses 'struct msg_msg' */
> +struct msg_msg;
>  #include "util.h"
>  
>  #include <linux/checkpoint.h>
> @@ -192,7 +192,7 @@ int restore_ipc_sem(struct ckpt_ctx *ctx)
>  	ckpt_debug("sem: do_semget key %d flag %#x id %d\n",
>  		 h->perms.key, semflag, h->perms.id);
>  	ret = do_semget(h->perms.key, h->sem_nsems, semflag, h->perms.id);
> -	ckpt_debug("sem: do_msgget ret %d\n", ret);
> +	ckpt_debug("sem: do_semget ret %d\n", ret);
>  	if (ret < 0)
>  		goto out;
>