Skip to content

Commit

Permalink
ipc: Remove extra braces
Browse files Browse the repository at this point in the history
Fix coding style. In the previous commit, I added braces because,
in addition to changing .data, .extra1 also changed. Now this is not
needed.

Fixes: 1f5c135 ("ipc: Store ipc sysctls in the ipc namespace")
Signed-off-by: Alexey Gladkov <[email protected]>
Link: https://lkml.kernel.org/r/37687827f630bc150210f5b8abeeb00f1336814e.1651584847.git.legion@kernel.org
Signed-off-by: Eric W. Biederman <[email protected]>
  • Loading branch information
legionus authored and ebiederm committed May 3, 2022
1 parent 0889f44 commit 38cd5b1
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions ipc/ipc_sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,42 +222,41 @@ bool setup_ipc_sysctls(struct ipc_namespace *ns)
int i;

for (i = 0; i < ARRAY_SIZE(ipc_sysctls); i++) {
if (tbl[i].data == &init_ipc_ns.shm_ctlmax) {
if (tbl[i].data == &init_ipc_ns.shm_ctlmax)
tbl[i].data = &ns->shm_ctlmax;

} else if (tbl[i].data == &init_ipc_ns.shm_ctlall) {
else if (tbl[i].data == &init_ipc_ns.shm_ctlall)
tbl[i].data = &ns->shm_ctlall;

} else if (tbl[i].data == &init_ipc_ns.shm_ctlmni) {
else if (tbl[i].data == &init_ipc_ns.shm_ctlmni)
tbl[i].data = &ns->shm_ctlmni;

} else if (tbl[i].data == &init_ipc_ns.shm_rmid_forced) {
else if (tbl[i].data == &init_ipc_ns.shm_rmid_forced)
tbl[i].data = &ns->shm_rmid_forced;

} else if (tbl[i].data == &init_ipc_ns.msg_ctlmax) {
else if (tbl[i].data == &init_ipc_ns.msg_ctlmax)
tbl[i].data = &ns->msg_ctlmax;

} else if (tbl[i].data == &init_ipc_ns.msg_ctlmni) {
else if (tbl[i].data == &init_ipc_ns.msg_ctlmni)
tbl[i].data = &ns->msg_ctlmni;

} else if (tbl[i].data == &init_ipc_ns.msg_ctlmnb) {
else if (tbl[i].data == &init_ipc_ns.msg_ctlmnb)
tbl[i].data = &ns->msg_ctlmnb;

} else if (tbl[i].data == &init_ipc_ns.sem_ctls) {
else if (tbl[i].data == &init_ipc_ns.sem_ctls)
tbl[i].data = &ns->sem_ctls;
#ifdef CONFIG_CHECKPOINT_RESTORE
} else if (tbl[i].data == &init_ipc_ns.ids[IPC_SEM_IDS].next_id) {
else if (tbl[i].data == &init_ipc_ns.ids[IPC_SEM_IDS].next_id)
tbl[i].data = &ns->ids[IPC_SEM_IDS].next_id;

} else if (tbl[i].data == &init_ipc_ns.ids[IPC_MSG_IDS].next_id) {
else if (tbl[i].data == &init_ipc_ns.ids[IPC_MSG_IDS].next_id)
tbl[i].data = &ns->ids[IPC_MSG_IDS].next_id;

} else if (tbl[i].data == &init_ipc_ns.ids[IPC_SHM_IDS].next_id) {
else if (tbl[i].data == &init_ipc_ns.ids[IPC_SHM_IDS].next_id)
tbl[i].data = &ns->ids[IPC_SHM_IDS].next_id;
#endif
} else {
else
tbl[i].data = NULL;
}
}

ns->ipc_sysctls = __register_sysctl_table(&ns->ipc_set, "kernel", tbl);
Expand Down

0 comments on commit 38cd5b1

Please sign in to comment.