summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-06-01 18:09:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2019-07-04 22:01:59 -0400
commit037f11b4752f717201143a1dc5d6acf3cb71ddfa (patch)
tree4fc67c21261d01d99100788a23b56da581d79f29 /fs/namespace.c
parent33488845f211afcdb7e5c00a3152890e06cdc78e (diff)
mnt_init(): call shmem_init() unconditionally
No point having two call sites (earlier in init_rootfs() from mnt_init() in case we are going to use shmem-style rootfs, later from do_basic_setup() unconditionally), along with the logics in shmem_init() itself to make the second call a no-op... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index e272c2403014..e6990f3d526d 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -29,6 +29,7 @@
29#include <linux/sched/task.h> 29#include <linux/sched/task.h>
30#include <uapi/linux/mount.h> 30#include <uapi/linux/mount.h>
31#include <linux/fs_context.h> 31#include <linux/fs_context.h>
32#include <linux/shmem_fs.h>
32 33
33#include "pnode.h" 34#include "pnode.h"
34#include "internal.h" 35#include "internal.h"
@@ -3740,6 +3741,7 @@ void __init mnt_init(void)
3740 fs_kobj = kobject_create_and_add("fs", NULL); 3741 fs_kobj = kobject_create_and_add("fs", NULL);
3741 if (!fs_kobj) 3742 if (!fs_kobj)
3742 printk(KERN_WARNING "%s: kobj create error\n", __func__); 3743 printk(KERN_WARNING "%s: kobj create error\n", __func__);
3744 shmem_init();
3743 init_rootfs(); 3745 init_rootfs();
3744 init_mount_tree(); 3746 init_mount_tree();
3745} 3747}