aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/msg.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
committerJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
commitd4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch)
treeeefd82c155bc27469a85667d759cd90facf4a6e3 /ipc/msg.c
parentc0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff)
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff)
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'ipc/msg.c')
-rw-r--r--ipc/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index 0e732e92e22f..7385de25788a 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -704,7 +704,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
704 msq->q_stime = get_seconds(); 704 msq->q_stime = get_seconds();
705 705
706 if (!pipelined_send(msq, msg)) { 706 if (!pipelined_send(msq, msg)) {
707 /* noone is waiting for this message, enqueue it */ 707 /* no one is waiting for this message, enqueue it */
708 list_add_tail(&msg->m_list, &msq->q_messages); 708 list_add_tail(&msg->m_list, &msq->q_messages);
709 msq->q_cbytes += msgsz; 709 msq->q_cbytes += msgsz;
710 msq->q_qnum++; 710 msq->q_qnum++;
@@ -842,7 +842,7 @@ long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
842 * Disable preemption. We don't hold a reference to the queue 842 * Disable preemption. We don't hold a reference to the queue
843 * and getting a reference would defeat the idea of a lockless 843 * and getting a reference would defeat the idea of a lockless
844 * operation, thus the code relies on rcu to guarantee the 844 * operation, thus the code relies on rcu to guarantee the
845 * existance of msq: 845 * existence of msq:
846 * Prior to destruction, expunge_all(-EIRDM) changes r_msg. 846 * Prior to destruction, expunge_all(-EIRDM) changes r_msg.
847 * Thus if r_msg is -EAGAIN, then the queue not yet destroyed. 847 * Thus if r_msg is -EAGAIN, then the queue not yet destroyed.
848 * rcu_read_lock() prevents preemption between reading r_msg 848 * rcu_read_lock() prevents preemption between reading r_msg