summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-10-29 12:23:51 -0400
committerJens Axboe <axboe@kernel.dk>2018-11-07 15:42:32 -0500
commita1ce35fa49852db60fc6e268038530be533c5b15 (patch)
tree7a0bb9576a3f0e31e22f849463eee6cdda26bad5 /init
parentf382fb0bcef4c37dc049e9f6963e3baf204d815c (diff)
block: remove dead elevator code
This removes a bunch of core and elevator related code. On the core front, we remove anything related to queue running, draining, initialization, plugging, and congestions. We also kill anything related to request allocation, merging, retrieval, and completion. Remove any checking for single queue IO schedulers, as they no longer exist. This means we can also delete a bunch of code related to request issue, adding, completion, etc - and all the SQ related ops and helpers. Also kill the load_default_modules(), as all that did was provide for a way to load the default single queue elevator. Tested-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_initrd.c3
-rw-r--r--init/initramfs.c6
-rw-r--r--init/main.c12
3 files changed, 0 insertions, 21 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index d1a5d885ce13..73e02ea5d5d1 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -53,9 +53,6 @@ static void __init handle_initrd(void)
53 ksys_mkdir("/old", 0700); 53 ksys_mkdir("/old", 0700);
54 ksys_chdir("/old"); 54 ksys_chdir("/old");
55 55
56 /* try loading default modules from initrd */
57 load_default_modules();
58
59 /* 56 /*
60 * In case that a resume from disk is carried out by linuxrc or one of 57 * In case that a resume from disk is carried out by linuxrc or one of
61 * its children, we need to tell the freezer not to wait for us. 58 * its children, we need to tell the freezer not to wait for us.
diff --git a/init/initramfs.c b/init/initramfs.c
index 640557788026..96af18fec4d0 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -644,12 +644,6 @@ static int __init populate_rootfs(void)
644#endif 644#endif
645 } 645 }
646 flush_delayed_fput(); 646 flush_delayed_fput();
647 /*
648 * Try loading default modules from initramfs. This gives
649 * us a chance to load before device_initcalls.
650 */
651 load_default_modules();
652
653 return 0; 647 return 0;
654} 648}
655rootfs_initcall(populate_rootfs); 649rootfs_initcall(populate_rootfs);
diff --git a/init/main.c b/init/main.c
index ee147103ba1b..ca0cdb0c388b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -996,17 +996,6 @@ static void __init do_pre_smp_initcalls(void)
996 do_one_initcall(initcall_from_entry(fn)); 996 do_one_initcall(initcall_from_entry(fn));
997} 997}
998 998
999/*
1000 * This function requests modules which should be loaded by default and is
1001 * called twice right after initrd is mounted and right before init is
1002 * exec'd. If such modules are on either initrd or rootfs, they will be
1003 * loaded before control is passed to userland.
1004 */
1005void __init load_default_modules(void)
1006{
1007 load_default_elevator_module();
1008}
1009
1010static int run_init_process(const char *init_filename) 999static int run_init_process(const char *init_filename)
1011{ 1000{
1012 argv_init[0] = init_filename; 1001 argv_init[0] = init_filename;
@@ -1180,5 +1169,4 @@ static noinline void __init kernel_init_freeable(void)
1180 */ 1169 */
1181 1170
1182 integrity_load_keys(); 1171 integrity_load_keys();
1183 load_default_modules();
1184} 1172}