Skip to content

Commit

Permalink
proc: move /proc/sysvipc creation to where it belongs
Browse files Browse the repository at this point in the history
Move the proc_mkdir() call within the sysvipc subsystem such that we
avoid polluting proc_root_init() with petty cpp.

[dave@stgolabs.net: contributed changelog]
Link: http://lkml.kernel.org/r/20180216161732.GA10297@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Davidlohr Bueso <dave@stgolabs.net>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alexey Dobriyan authored and torvalds committed Apr 11, 2018
1 parent 2f89742 commit e74a0ef
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 0 additions & 4 deletions fs/proc/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,6 @@ void __init proc_root_init(void)
proc_symlink("mounts", NULL, "self/mounts");

proc_net_init();

#ifdef CONFIG_SYSVIPC
proc_mkdir("sysvipc", NULL);
#endif
proc_mkdir("fs", NULL);
proc_mkdir("driver", NULL);
proc_create_mount_point("fs/nfsd"); /* somewhere for the nfsd filesystem to be mounted */
Expand Down
1 change: 1 addition & 0 deletions ipc/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ static int __init ipc_init(void)
{
int err_sem, err_msg;

proc_mkdir("sysvipc", NULL);
err_sem = sem_init();
WARN(err_sem, "ipc: sysv sem_init failed: %d\n", err_sem);
err_msg = msg_init();
Expand Down

0 comments on commit e74a0ef

Please sign in to comment.