diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /ipc/msg.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'ipc/msg.c')
-rw-r--r-- | ipc/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |