Commit e74a0eff authored Apr 10, 2018 by Alexey Dobriyan Committed by Linus Torvalds Apr 11, 2018

proc: move /proc/sysvipc creation to where it belongs

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>

parent 2f897424

fs/proc/root.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 */

ipc/util.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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();

Admin message