summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro2019-06-02 00:09:44 +0200
committerAl Viro2019-07-05 04:01:59 +0200
commit037f11b4752f717201143a1dc5d6acf3cb71ddfa (patch)
tree4fc67c21261d01d99100788a23b56da581d79f29 /mm
parentconstify ksys_mount() string arguments (diff)
downloadkernel-qcow2-linux-037f11b4752f717201143a1dc5d6acf3cb71ddfa.tar.gz
kernel-qcow2-linux-037f11b4752f717201143a1dc5d6acf3cb71ddfa.tar.xz
kernel-qcow2-linux-037f11b4752f717201143a1dc5d6acf3cb71ddfa.zip
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 'mm')
-rw-r--r--mm/shmem.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 1bb3b8dc8bb2..1f67ec9e2062 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3775,10 +3775,6 @@ int __init shmem_init(void)
{
int error;
- /* If rootfs called this, don't re-init */
- if (shmem_inode_cachep)
- return 0;
-
shmem_init_inodecache();
error = register_filesystem(&shmem_fs_type);