aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorDavidlohr Bueso <davidlohr@hp.com>2014-06-06 17:37:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:14 -0400
commitf75a2f358d840e99212b1828b131e8fe8629ac43 (patch)
tree4bb98f5f7fa79500ab7620b10fe555a1e8433ceb /ipc
parentf57a19a7bcd9d1b4b539daad5acd12ba663812b5 (diff)
ipc,msg: use current->state helpers
Call __set_current_state() instead of assigning the new state directly. Signed-off-by: Davidlohr Bueso <davidlohr@hp.com> Signed-off-by: Manfred Spraul <manfred@colorfullif.com> Cc: Aswin Chandramouleeswaran <aswin@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index 7ed1ef338e76..5a8489b36e5f 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -227,7 +227,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
227static inline void ss_add(struct msg_queue *msq, struct msg_sender *mss) 227static inline void ss_add(struct msg_queue *msq, struct msg_sender *mss)
228{ 228{
229 mss->tsk = current; 229 mss->tsk = current;
230 current->state = TASK_INTERRUPTIBLE; 230 __set_current_state(TASK_INTERRUPTIBLE);
231 list_add_tail(&mss->list, &msq->q_senders); 231 list_add_tail(&mss->list, &msq->q_senders);
232} 232}
233 233
@@ -976,7 +976,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl
976 else 976 else
977 msr_d.r_maxsize = bufsz; 977 msr_d.r_maxsize = bufsz;
978 msr_d.r_msg = ERR_PTR(-EAGAIN); 978 msr_d.r_msg = ERR_PTR(-EAGAIN);
979 current->state = TASK_INTERRUPTIBLE; 979 __set_current_state(TASK_INTERRUPTIBLE);
980 980
981 ipc_unlock_object(&msq->q_perm); 981 ipc_unlock_object(&msq->q_perm);
982 rcu_read_unlock(); 982 rcu_read_unlock();