luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initramfs: debug detected compression method

Browse Source 
This can greatly aid in narrowing down the real source of initramfs
problems such as failures related to the compression of the in-kernel
initramfs when an external initramfs is in use as well.  Existing errors
are ambiguous as to which initramfs is a problem and why.

[akpm@linux-foundation.org: use pr_debug()]
Signed-off-by: Daniel M. Weeks <dan@danweeks.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daniel M. Weeks 2014-04-07 15:39:16 -07:00 committed by Linus Torvalds
parent 16caed3196
commit 6aa7a29aa8
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init/initramfs.c
View File

@ -455,6 +455,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
} }
this_header = 0; this_header = 0;
decompress = decompress_method(buf, len, &compress_name); decompress = decompress_method(buf, len, &compress_name);
pr_debug("Detected %s compressed data\n", compress_name);
if (decompress) { if (decompress) {
res = decompress(buf, len, NULL, flush_buffer, NULL, res = decompress(buf, len, NULL, flush_buffer, NULL,
&my_inptr, error); &my_inptr, error);

3
lib/decompress.c
View File

@ -16,6 +16,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/printk.h>
#ifndef CONFIG_DECOMPRESS_GZIP #ifndef CONFIG_DECOMPRESS_GZIP
# define gunzip NULL # define gunzip NULL
@ -61,6 +62,8 @@ decompress_fn __init decompress_method(const unsigned char *inbuf, int len,
if (len < 2) if (len < 2)
return NULL; /* Need at least this much... */ return NULL; /* Need at least this much... */
pr_debug("Compressed data magic: %#.2x %#.2x\n", inbuf[0], inbuf[1]);
for (cf = compressed_formats; cf->name; cf++) { for (cf = compressed_formats; cf->name; cf++) {
if (!memcmp(inbuf, cf->magic, 2)) if (!memcmp(inbuf, cf->magic, 2))
break; break;