X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ipc%2Fmsg.c;h=91e292402a9f5c3f7ef604b77bcdf149fa15dfef;hb=a9fdee76789476a10f923f9fb3c84993042da3ac;hp=62aead43ec005c9e4a05e8e938c83a3bea838460;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/ipc/msg.c b/ipc/msg.c
index 62aead43e..91e292402 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -25,7 +25,6 @@
 #include <linux/security.h>
 #include <linux/sched.h>
 #include <linux/vs_base.h>
-#include <linux/syscalls.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>
@@ -99,7 +98,7 @@ static int newque (key_t key, int msgflg)
 
 	msq->q_perm.mode = (msgflg & S_IRWXUGO);
 	msq->q_perm.key = key;
-	msq->q_perm.xid = vx_current_xid();
+	msq->q_perm.xid = current->xid;
 
 	msq->q_perm.security = NULL;
 	retval = security_msg_queue_alloc(msq);
@@ -384,7 +383,7 @@ asmlinkage long sys_msgctl (int msqid, int cmd, struct msqid_ds __user *buf)
 		int success_return;
 		if (!buf)
 			return -EFAULT;
-		if(cmd == MSG_STAT && msqid >= msg_ids.entries->size)
+		if(cmd == MSG_STAT && msqid >= msg_ids.size)
 			return -EINVAL;
 
 		memset(&tbuf,0,sizeof(tbuf));
@@ -764,7 +763,6 @@ asmlinkage long sys_msgrcv (int msqid, struct msgbuf __user *msgp, size_t msgsz,
 			cpu_relax();
 			msg = (struct msg_msg*) msr_d.r_msg;
 		}
-
 		/* Lockless receive, part 3:
 		 * If there is a message or an error then accept it without
 		 * locking.