---

yaml --- r: 176697 b: refs/heads/master c: e5cc9c7 h: refs/heads/master i: 176695: 640bb07 v: v3
git-mirror · Dec 16, 2009 · f309785 · f309785
1 parent e387866
commit f309785
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d987f8b213f2cdcc52b2ca9ee67161516e4d256a
+refs/heads/master: e5cc9c7b1a3e7ae4d700d9fce168fb597bcfe9b6
diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c
@@ -624,7 +624,7 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in,
 static int semctl_nolock(struct ipc_namespace *ns, int semid,
 			 int cmd, int version, union semun arg)
 {
-	int err = -EINVAL;
+	int err;
 	struct sem_array *sma;
 
 	switch(cmd) {
@@ -701,7 +701,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
 	default:
 		return -EINVAL;
 	}
-	return err;
 out_unlock:
 	sem_unlock(sma);
 	return err;