Skip to content

Commit 38cd5b1

Browse files
legionusebiederm
authored andcommittedMay 3, 2022
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: 1f5c135 ("ipc: Store ipc sysctls in the ipc namespace") Signed-off-by: Alexey Gladkov <legion@kernel.org> Link: https://lkml.kernel.org/r/37687827f630bc150210f5b8abeeb00f1336814e.1651584847.git.legion@kernel.org Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
1 parent 0889f44 commit 38cd5b1

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed
 

‎ipc/ipc_sysctl.c

+12-13
Original file line numberDiff line numberDiff line change
@@ -222,42 +222,41 @@ bool setup_ipc_sysctls(struct ipc_namespace *ns)
222222
int i;
223223

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

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

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

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

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

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

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

246-
} else if (tbl[i].data == &init_ipc_ns.sem_ctls) {
246+
else if (tbl[i].data == &init_ipc_ns.sem_ctls)
247247
tbl[i].data = &ns->sem_ctls;
248248
#ifdef CONFIG_CHECKPOINT_RESTORE
249-
} else if (tbl[i].data == &init_ipc_ns.ids[IPC_SEM_IDS].next_id) {
249+
else if (tbl[i].data == &init_ipc_ns.ids[IPC_SEM_IDS].next_id)
250250
tbl[i].data = &ns->ids[IPC_SEM_IDS].next_id;
251251

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

255-
} else if (tbl[i].data == &init_ipc_ns.ids[IPC_SHM_IDS].next_id) {
255+
else if (tbl[i].data == &init_ipc_ns.ids[IPC_SHM_IDS].next_id)
256256
tbl[i].data = &ns->ids[IPC_SHM_IDS].next_id;
257257
#endif
258-
} else {
258+
else
259259
tbl[i].data = NULL;
260-
}
261260
}
262261

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

0 commit comments

Comments
 (0)
Please sign in to comment.