From a8e7e19e2906394552cd12124931b27766c9179c Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 May 2013 11:04:29 -0700
Subject: [PATCH] --- yaml --- r: 372859 b: refs/heads/master c:
 941b0304a74b240c607ff098401fd4ef70c9d1cc h: refs/heads/master i:   372857:
 12e4a421f84673199482b376b76c14d2b1c36b74   372855:
 d25c835a50f82be76c53157dcae4d57c704b9d7c v: v3

---
 [refs]          | 2 +-
 trunk/ipc/sem.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f83af13893a7..7accc4ee4d49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c728b9c87b59fb943c4cba0552d38152787a4ab6
+refs/heads/master: 941b0304a74b240c607ff098401fd4ef70c9d1cc
diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c
index f2151babd26a..899b598b63be 100644
--- a/trunk/ipc/sem.c
+++ b/trunk/ipc/sem.c
@@ -948,8 +948,8 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
 
 		memset(&tbuf, 0, sizeof(tbuf));
 
+		rcu_read_lock();
 		if (cmd == SEM_STAT) {
-			rcu_read_lock();
 			sma = sem_obtain_object(ns, semid);
 			if (IS_ERR(sma)) {
 				err = PTR_ERR(sma);
@@ -957,7 +957,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
 			}
 			id = sma->sem_perm.id;
 		} else {
-			rcu_read_lock();
 			sma = sem_obtain_object_check(ns, semid);
 			if (IS_ERR(sma)) {
 				err = PTR_ERR(sma);