From 38cd5b12b7854941ede1954cf5a2393eb94b5d37 Mon Sep 17 00:00:00 2001 From: Alexey Gladkov Date: Tue, 3 May 2022 15:39:57 +0200 Subject: ipc: Remove extra braces 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: 1f5c135ee509 ("ipc: Store ipc sysctls in the ipc namespace") Signed-off-by: Alexey Gladkov Link: https://lkml.kernel.org/r/37687827f630bc150210f5b8abeeb00f1336814e.1651584847.git.legion@kernel.org Signed-off-by: Eric W. Biederman --- ipc/ipc_sysctl.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'ipc/ipc_sysctl.c') diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index 5a58598d48c8..ef313ecfb53a 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -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); -- cgit v1.2.3-58-ga151