Commit 58017a3e authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'initramfs-fix-4.12-rc1' of git://github.com/stffrdhrn/linux

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
parents ab182e67 17a9be31
...@@ -608,9 +608,11 @@ static void __init clean_rootfs(void) ...@@ -608,9 +608,11 @@ static void __init clean_rootfs(void)
static int __init populate_rootfs(void) static int __init populate_rootfs(void)
{ {
/* Load the built in initramfs */
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
if (err) if (err)
panic("%s", err); /* Failed to decompress INTERNAL initramfs */ panic("%s", err); /* Failed to decompress INTERNAL initramfs */
/* If available load the bootloader supplied initrd */
if (initrd_start) { if (initrd_start) {
#ifdef CONFIG_BLK_DEV_RAM #ifdef CONFIG_BLK_DEV_RAM
int fd; int fd;
...@@ -648,13 +650,14 @@ static int __init populate_rootfs(void) ...@@ -648,13 +650,14 @@ static int __init populate_rootfs(void)
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
free_initrd(); free_initrd();
#endif #endif
}
flush_delayed_fput(); flush_delayed_fput();
/* /*
* Try loading default modules from initramfs. This gives * Try loading default modules from initramfs. This gives
* us a chance to load before device_initcalls. * us a chance to load before device_initcalls.
*/ */
load_default_modules(); load_default_modules();
}
return 0; return 0;
} }
rootfs_initcall(populate_rootfs); rootfs_initcall(populate_rootfs);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment