revert "initramfs: cleanup incomplete rootfs"

akpm00 · torvalds · commit a841c673f135 · 2019-02-21T09:00:59.000-08:00
Revert ff1522b ("initramfs: cleanup incomplete rootfs"). Andy reports : This breaks my setup where I have U-boot provided more size of initramfs : than needed. This allows a bit of flexibility to increase or decrease : initramfs compressed image without taking care of bootloader. The proper : solution is to do this if we sure that we didn't get enough memory, : otherwise I can't consider the error fatal to clean up rootfs. Fixes: ff1522b ("initramfs: cleanup incomplete rootfs") Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com> Tested-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: David Engraf <david.engraf@sysgo.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Philippe Ombredanne <pombredanne@nexb.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/init/initramfs.c b/init/initramfs.c
@@ -550,6 +550,7 @@ static void __init free_initrd(void)
 	initrd_end = 0;
 }
 
+#ifdef CONFIG_BLK_DEV_RAM
 #define BUF_SIZE 1024
 static void __init clean_rootfs(void)
 {
@@ -596,6 +597,7 @@ static void __init clean_rootfs(void)
 	ksys_close(fd);
 	kfree(buf);
 }
+#endif
 
 static int __init populate_rootfs(void)
 {
@@ -638,10 +640,8 @@ static int __init populate_rootfs(void)
 		printk(KERN_INFO "Unpacking initramfs...\n");
 		err = unpack_to_rootfs((char *)initrd_start,
 			initrd_end - initrd_start);
-		if (err) {
+		if (err)
 			printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
-			clean_rootfs();
-		}
 		free_initrd();
 #endif
 	}

Original file line number	Diff line number	Diff line change
`@@ -550,6 +550,7 @@ static void __init free_initrd(void)`
`550`	`550`	`initrd_end = 0;`
`551`	`551`	`}`
`552`	`552`
	`553`	`+#ifdef CONFIG_BLK_DEV_RAM`
`553`	`554`	`#define BUF_SIZE 1024`
`554`	`555`	`static void __init clean_rootfs(void)`
`555`	`556`	`{`
`@@ -596,6 +597,7 @@ static void __init clean_rootfs(void)`
`596`	`597`	`ksys_close(fd);`
`597`	`598`	`kfree(buf);`
`598`	`599`	`}`
	`600`	`+#endif`
`599`	`601`
`600`	`602`	`static int __init populate_rootfs(void)`
`601`	`603`	`{`
`@@ -638,10 +640,8 @@ static int __init populate_rootfs(void)`
`638`	`640`	`printk(KERN_INFO "Unpacking initramfs...\n");`
`639`	`641`	`err = unpack_to_rootfs((char *)initrd_start,`
`640`	`642`	`initrd_end - initrd_start);`
`641`		`- if (err) {`
	`643`	`+ if (err)`
`642`	`644`	`printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);`
`643`		`- clean_rootfs();`
`644`		`- }`
`645`	`645`	`free_initrd();`
`646`	`646`	`#endif`
`647`	`647`	`}`