a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipc: remove braces for single statements

Browse Source 
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>
This commit is contained in:
Davidlohr Bueso 2014-01-27 17:07:06 -08:00 committed by Linus Torvalds
parent 8001c85810
commit 3ab08fe204
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipc/compat.c
View File

@ -288,11 +288,11 @@ static long do_compat_semctl(int first, int second, int third, u32 pad)
break; break;
case IPC_SET: case IPC_SET:
if (version == IPC_64) { if (version == IPC_64)
err = get_compat_semid64_ds(&s64, compat_ptr(pad)); err = get_compat_semid64_ds(&s64, compat_ptr(pad));
} else { else
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)); up64 = compat_alloc_user_space(sizeof(s64));
if (copy_to_user(up64, &s64, sizeof(s64))) if (copy_to_user(up64, &s64, sizeof(s64)))
err = -EFAULT; err = -EFAULT;
@ -515,11 +515,11 @@ long compat_sys_msgctl(int first, int second, void __user *uptr)
break; break;
case IPC_SET: case IPC_SET:
if (version == IPC_64) { if (version == IPC_64)
err = get_compat_msqid64(&m64, uptr); err = get_compat_msqid64(&m64, uptr);
} else { else
err = get_compat_msqid(&m64, uptr); err = get_compat_msqid(&m64, uptr);
}
if (err) if (err)
break; break;
p = compat_alloc_user_space(sizeof(m64)); p = compat_alloc_user_space(sizeof(m64));
@ -702,11 +702,11 @@ long compat_sys_shmctl(int first, int second, void __user *uptr)
case IPC_SET: case IPC_SET:
if (version == IPC_64) { if (version == IPC_64)
err = get_compat_shmid64_ds(&s64, uptr); err = get_compat_shmid64_ds(&s64, uptr);
} else { else
err = get_compat_shmid_ds(&s64, uptr); err = get_compat_shmid_ds(&s64, uptr);
}
if (err) if (err)
break; break;
p = compat_alloc_user_space(sizeof(s64)); p = compat_alloc_user_space(sizeof(s64));

6
ipc/mqueue.c
View File

@ -1303,11 +1303,11 @@ retry:
out_fput: out_fput:
fdput(f); fdput(f);
out: out:
if (sock) { if (sock)
netlink_detachskb(sock, nc); netlink_detachskb(sock, nc);
} else if (nc) { else if (nc)
dev_kfree_skb(nc); dev_kfree_skb(nc);
}
return ret; return ret;
} }

8
ipc/sem.c
View File

@ -492,9 +492,9 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
size = sizeof(*sma) + nsems * sizeof(struct sem); size = sizeof(*sma) + nsems * sizeof(struct sem);
sma = ipc_rcu_alloc(size); sma = ipc_rcu_alloc(size);
if (!sma) { if (!sma)
return -ENOMEM; return -ENOMEM;
}
memset(sma, 0, size); memset(sma, 0, size);
sma->sem_perm.mode = (semflg & S_IRWXUGO); sma->sem_perm.mode = (semflg & S_IRWXUGO);
@ -1967,10 +1967,8 @@ sleep_again:
* If queue.status != -EINTR we are woken up by another process. * If queue.status != -EINTR we are woken up by another process.
* Leave without unlink_queue(), but with sem_unlock(). * Leave without unlink_queue(), but with sem_unlock().
*/ */
if (error != -EINTR)
if (error != -EINTR) {
goto out_unlock_free; goto out_unlock_free;
}
/* /*
* If an interrupt occurred we have to clean up the queue * If an interrupt occurred we have to clean up the queue

3
ipc/util.c
View File

@ -183,9 +183,8 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
NULL, /* parent dir */ NULL, /* parent dir */
&sysvipc_proc_fops, &sysvipc_proc_fops,
iface); iface);
if (!pde) { if (!pde)
kfree(iface); kfree(iface);
}
} }
#endif #endif