Commit 9ab6b718 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

initramfs: remove the populate_initrd_image and clean_rootfs stubs 



If initrd support is not enable just print the warning directly instead
of hiding the fact that we just failed behind two stub functions.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9acc17ba

init/initramfs.c

+4 −11
Original line number Diff line number Diff line
@@ -618,13 +618,7 @@ static void __init clean_rootfs(void) 
	ksys_close(fd);

	kfree(buf);

}

#else

static inline void clean_rootfs(void)

{

}

#endif /* CONFIG_BLK_DEV_RAM */



#ifdef CONFIG_BLK_DEV_RAM

static void __init populate_initrd_image(char *err)

{

	ssize_t written;
@@ -644,11 +638,6 @@ static void __init populate_initrd_image(char *err) 
		       written, initrd_end - initrd_start);

	ksys_close(fd);

}

#else

static void __init populate_initrd_image(char *err)

{

	printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);

}

#endif /* CONFIG_BLK_DEV_RAM */



static int __init populate_rootfs(void)
@@ -668,8 +657,12 @@ static int __init populate_rootfs(void) 


	err = unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start);

	if (err) {

#ifdef CONFIG_BLK_DEV_RAM

		clean_rootfs();

		populate_initrd_image(err);

#else

		printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);

#endif

	}



done:

CRA Git | Maintained and supported by SUSTech CRA and CCSE