aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-01-08 15:14:17 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-01-08 15:14:17 -0800
commit889c92d21db40be0b7d22a59395060237895bb85 (patch)
treedb76e1e002e450cccc1b7a8119ad629eccc24da8 /init
parent6c11b12ac6f101732d43b5682f5b3ae4dda4205f (diff)
downloadkernel_samsung_espresso10-889c92d21db40be0b7d22a59395060237895bb85.zip
kernel_samsung_espresso10-889c92d21db40be0b7d22a59395060237895bb85.tar.gz
kernel_samsung_espresso10-889c92d21db40be0b7d22a59395060237895bb85.tar.bz2
bzip2/lzma: centralize format detection
Centralize the compression format detection to a common routine in the lib directory, and use it for both initramfs and initrd. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_rd.c38
-rw-r--r--init/initramfs.c39
2 files changed, 14 insertions, 63 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 9c9d7db..a06ed4f 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -12,9 +12,6 @@
#include <linux/decompress/generic.h>
-#include <linux/decompress/bunzip2.h>
-#include <linux/decompress/unlzma.h>
-#include <linux/decompress/inflate.h>
int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
@@ -49,24 +46,6 @@ static int __init crd_load(int in_fd, int out_fd, decompress_fn deco);
* cramfs
* gzip
*/
-static const struct compress_format {
- unsigned char magic[2];
- const char *name;
- decompress_fn decompressor;
-} compressed_formats[] = {
-#ifdef CONFIG_RD_GZIP
- { {037, 0213}, "gzip", gunzip },
- { {037, 0236}, "gzip", gunzip },
-#endif
-#ifdef CONFIG_RD_BZIP2
- { {0x42, 0x5a}, "bzip2", bunzip2 },
-#endif
-#ifdef CONFIG_RD_LZMA
- { {0x5d, 0x00}, "lzma", unlzma },
-#endif
- { {0, 0}, NULL, NULL }
-};
-
static int __init
identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
{
@@ -77,7 +56,7 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
struct cramfs_super *cramfsb;
int nblocks = -1;
unsigned char *buf;
- const struct compress_format *cf;
+ const char *compress_name;
buf = kmalloc(size, GFP_KERNEL);
if (!buf)
@@ -95,15 +74,12 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
sys_lseek(fd, start_block * BLOCK_SIZE, 0);
sys_read(fd, buf, size);
- for (cf = compressed_formats; cf->decompressor; cf++) {
- if (buf[0] == cf->magic[0] && buf[1] == cf->magic[1]) {
- printk(KERN_NOTICE
- "RAMDISK: %s image found at block %d\n",
- cf->name, start_block);
- *decompressor = cf->decompressor;
- nblocks = 0;
- goto done;
- }
+ *decompressor = decompress_method(buf, size, &compress_name);
+ if (*decompressor) {
+ printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n",
+ compress_name, start_block);
+ nblocks = 0;
+ goto done;
}
/* romfs is at block zero too */
diff --git a/init/initramfs.c b/init/initramfs.c
index a3ba91c..2f42984 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -416,13 +416,13 @@ static int __init flush_buffer(void *bufv, unsigned len)
static unsigned my_inptr; /* index of next byte to be processed in inbuf */
-#include <linux/decompress/bunzip2.h>
-#include <linux/decompress/unlzma.h>
-#include <linux/decompress/inflate.h>
+#include <linux/decompress/generic.h>
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{
int written;
+ decompress_fn decompress;
+
dry_run = check_only;
header_buf = kmalloc(110, GFP_KERNEL);
symlink_buf = kmalloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1, GFP_KERNEL);
@@ -450,35 +450,10 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
continue;
}
this_header = 0;
-#ifdef CONFIG_RD_GZIP
- if (!gunzip(buf, len, NULL, flush_buffer, NULL,
- &my_inptr, error) &&
- message == NULL)
- goto ok;
-#endif
-
-#ifdef CONFIG_RD_BZIP2
- message = NULL; /* Zero out message, or else cpio will
- think an error has already occured */
- if (!bunzip2(buf, len, NULL, flush_buffer, NULL,
- &my_inptr, error) &&
- message == NULL) {
- goto ok;
- }
-#endif
-
-#ifdef CONFIG_RD_LZMA
- message = NULL; /* Zero out message, or else cpio will
- think an error has already occured */
- if (!unlzma(buf, len, NULL, flush_buffer, NULL,
- &my_inptr, error) &&
- message == NULL) {
- goto ok;
- }
-#endif
-#if defined CONFIG_RD_GZIP || defined CONFIG_RD_BZIP2 || defined CONFIG_RD_LZMA
-ok:
-#endif
+ decompress = decompress_method(buf, len, NULL);
+ if (decompress)
+ decompress(buf, len, NULL, flush_buffer, NULL,
+ &my_inptr, error);
if (state != Reset)
error("junk in compressed archive");
this_header = saved_offset + my_inptr;