summaryrefslogtreecommitdiffstats
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorDavidlohr Bueso <davidlohr@hp.com>2014-01-27 20:07:06 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-28 00:02:39 -0500
commit3ab08fe20475658bab65118d599d03cd8ca44dd1 (patch)
tree25f4f43e58aad6a4c286a098f1f1f9d69452c30d /ipc/sem.c
parent8001c85810dd2277d75ae60376e840456afa9b7e (diff)
ipc: remove braces for single statements
Deal with checkpatch messages: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Davidlohr Bueso <davidlohr@hp.com> Cc: Aswin Chandramouleeswaran <aswin@hp.com> Cc: Rik van Riel <riel@redhat.com> Acked-by: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/sem.c')
-rw-r--r--ipc/sem.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 1b1acdb0aee8..bee555417312 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -492,9 +492,9 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
492 492
493 size = sizeof(*sma) + nsems * sizeof(struct sem); 493 size = sizeof(*sma) + nsems * sizeof(struct sem);
494 sma = ipc_rcu_alloc(size); 494 sma = ipc_rcu_alloc(size);
495 if (!sma) { 495 if (!sma)
496 return -ENOMEM; 496 return -ENOMEM;
497 } 497
498 memset(sma, 0, size); 498 memset(sma, 0, size);
499 499
500 sma->sem_perm.mode = (semflg & S_IRWXUGO); 500 sma->sem_perm.mode = (semflg & S_IRWXUGO);
@@ -1967,10 +1967,8 @@ sleep_again:
1967 * If queue.status != -EINTR we are woken up by another process. 1967 * If queue.status != -EINTR we are woken up by another process.
1968 * Leave without unlink_queue(), but with sem_unlock(). 1968 * Leave without unlink_queue(), but with sem_unlock().
1969 */ 1969 */
1970 1970 if (error != -EINTR)
1971 if (error != -EINTR) {
1972 goto out_unlock_free; 1971 goto out_unlock_free;
1973 }
1974 1972
1975 /* 1973 /*
1976 * If an interrupt occurred we have to clean up the queue 1974 * If an interrupt occurred we have to clean up the queue