leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mnt_init(): call shmem_init() unconditionally

Browse Source 
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>
This commit is contained in:
Al Viro 2019-06-01 18:09:44 -04:00
parent 33488845f2
commit 037f11b475
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/namespace.c
View File

@ -29,6 +29,7 @@
#include <linux/sched/task.h> #include <linux/sched/task.h>
#include <uapi/linux/mount.h> #include <uapi/linux/mount.h>
#include <linux/fs_context.h> #include <linux/fs_context.h>
#include <linux/shmem_fs.h>
#include "pnode.h" #include "pnode.h"
#include "internal.h" #include "internal.h"
@ -3740,6 +3741,7 @@ void __init mnt_init(void)
fs_kobj = kobject_create_and_add("fs", NULL); fs_kobj = kobject_create_and_add("fs", NULL);
if (!fs_kobj) if (!fs_kobj)
printk(KERN_WARNING "%s: kobj create error\n", __func__); printk(KERN_WARNING "%s: kobj create error\n", __func__);
shmem_init();
init_rootfs(); init_rootfs();
init_mount_tree(); init_mount_tree();
} }

2
include/linux/init.h
View File

@ -148,7 +148,7 @@ extern unsigned int reset_devices;
/* used by init/main.c */ /* used by init/main.c */
void setup_arch(char **); void setup_arch(char **);
void prepare_namespace(void); void prepare_namespace(void);
int __init init_rootfs(void); void __init init_rootfs(void);
extern struct file_system_type rootfs_fs_type; extern struct file_system_type rootfs_fs_type;
#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX) #if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX)

9
init/do_mounts.c
View File

@ -643,14 +643,9 @@ struct file_system_type rootfs_fs_type = {
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
int __init init_rootfs(void) void __init init_rootfs(void)
{ {
int err = 0;
if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] && if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
(!root_fs_names || strstr(root_fs_names, "tmpfs"))) { (!root_fs_names || strstr(root_fs_names, "tmpfs")))
err = shmem_init();
is_tmpfs = true; is_tmpfs = true;
}
return err;
} }

1
init/main.c
View File

@ -1000,7 +1000,6 @@ static void __init do_initcalls(void)
static void __init do_basic_setup(void) static void __init do_basic_setup(void)
{ {
cpuset_init_smp(); cpuset_init_smp();
shmem_init();
driver_init(); driver_init();
init_irq_proc(); init_irq_proc();
do_ctors(); do_ctors();

4
mm/shmem.c
View File

@ -3775,10 +3775,6 @@ int __init shmem_init(void)
{ {
int error; int error;
/* If rootfs called this, don't re-init */
if (shmem_inode_cachep)
return 0;
shmem_init_inodecache(); shmem_init_inodecache();
error = register_filesystem(&shmem_fs_type); error = register_filesystem(&shmem_fs_type);