Skip to contentSkip to conversation

checkpoint_sem trivialities

PATCH Applied Serge E. Hallyn 2 participants 2 messages Jun 16, 2009 – Jun 18, 2009 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 checkpoint_sem trivialities

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?

---
 ipc/checkpoint_sem.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
ipc/checkpoint_sem.c +2 -2
index e6934dc..19e9402 100644
@@ -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;
 
Signature · 1 line
1.6.1

A message that is not in the archive (sent off-list or not yet received): 20090616220410.GA7115-r/[email protected]

Applied
#2 lore raw

Applied.

Quoted 32 lines · 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?

---
 ipc/checkpoint_sem.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
ipc/checkpoint_sem.c +2 -2
index e6934dc..19e9402 100644
@@ -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;