Merge tag 'initramfs-fix-4.12-rc1' of git://github.com/stffrdhrn/linux (58017a3e) · Commits · 戴 / test

Pull initramfs fix from Stafford Horne: "This is a fix for an issue that has caused 4.11 to not boot on OpenRISC. I should have caught this during the 4.11 cycle but I had been busy on testing some other series of patches. I would have considered pushing it though a different path but Al Viro suggested submitting directly to you. Also, its just one as I havent really got anything else ready on my queue for 4.12. Summary: - Ensure fput() flush is done even for builtin initramfs" * tag 'initramfs-fix-4.12-rc1' of git://github.com/stffrdhrn/linux: initramfs: Always do fput() and load modules after rootfs populate

init/initramfs.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -608,9 +608,11 @@ static void __init clean_rootfs(void)

		static int __init populate_rootfs(void)
		{
		/* Load the built in initramfs */
		char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
		if (err)
		panic("%s", err); /* Failed to decompress INTERNAL initramfs */
		/* If available load the bootloader supplied initrd */
		if (initrd_start) {
		#ifdef CONFIG_BLK_DEV_RAM
		int fd;
		@@ -648,13 +650,14 @@ static int __init populate_rootfs(void)
		printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
		free_initrd();
		#endif
		}
		flush_delayed_fput();
		/*
		* Try loading default modules from initramfs. This gives
		* us a chance to load before device_initcalls.
		*/
		load_default_modules();
		}

		return 0;
		}
		rootfs_initcall(populate_rootfs);

Admin message