git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
ipc
/
msg.c
diff --git
a/ipc/msg.c
b/ipc/msg.c
index
62aead4
..
91e2924
100644
(file)
--- 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/security.h>
#include <linux/sched.h>
#include <linux/vs_base.h>
-#include <linux/syscalls.h>
#include <asm/current.h>
#include <asm/uaccess.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.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);
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;
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));
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;
}
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.
/* Lockless receive, part 3:
* If there is a message or an error then accept it without
* locking.