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>
- if (version == IPC_64) {
err = get_compat_semid64_ds(&s64, compat_ptr(pad));
err = get_compat_semid64_ds(&s64, compat_ptr(pad));
err = get_compat_semid_ds(&s64, compat_ptr(pad));
err = get_compat_semid_ds(&s64, compat_ptr(pad));
up64 = compat_alloc_user_space(sizeof(s64));
if (copy_to_user(up64, &s64, sizeof(s64)))
err = -EFAULT;
up64 = compat_alloc_user_space(sizeof(s64));
if (copy_to_user(up64, &s64, sizeof(s64)))
err = -EFAULT;
- if (version == IPC_64) {
err = get_compat_msqid64(&m64, uptr);
err = get_compat_msqid64(&m64, uptr);
err = get_compat_msqid(&m64, uptr);
err = get_compat_msqid(&m64, uptr);
if (err)
break;
p = compat_alloc_user_space(sizeof(m64));
if (err)
break;
p = compat_alloc_user_space(sizeof(m64));
- if (version == IPC_64) {
err = get_compat_shmid64_ds(&s64, uptr);
err = get_compat_shmid64_ds(&s64, uptr);
err = get_compat_shmid_ds(&s64, uptr);
err = get_compat_shmid_ds(&s64, uptr);
if (err)
break;
p = compat_alloc_user_space(sizeof(s64));
if (err)
break;
p = compat_alloc_user_space(sizeof(s64));
netlink_detachskb(sock, nc);
netlink_detachskb(sock, nc);
size = sizeof(*sma) + nsems * sizeof(struct sem);
sma = ipc_rcu_alloc(size);
size = sizeof(*sma) + nsems * sizeof(struct sem);
sma = ipc_rcu_alloc(size);
memset(sma, 0, size);
sma->sem_perm.mode = (semflg & S_IRWXUGO);
memset(sma, 0, size);
sma->sem_perm.mode = (semflg & S_IRWXUGO);
* If queue.status != -EINTR we are woken up by another process.
* Leave without unlink_queue(), but with sem_unlock().
*/
* If queue.status != -EINTR we are woken up by another process.
* Leave without unlink_queue(), but with sem_unlock().
*/
-
- if (error != -EINTR) {
/*
* If an interrupt occurred we have to clean up the queue
/*
* If an interrupt occurred we have to clean up the queue
NULL, /* parent dir */
&sysvipc_proc_fops,
iface);
NULL, /* parent dir */
&sysvipc_proc_fops,
iface);