netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / init / do_mounts_rd.c

diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 9c9d7db..027a402 100644 (file)
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -9,12 +9,10 @@
 #include <linux/string.h>
 
 #include "do_mounts.h"
+#include "../fs/squashfs/squashfs_fs.h"
 
 #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 */
 
@@ -47,26 +45,9 @@ static int __init crd_load(int in_fd, int out_fd, decompress_fn deco);
  *     ext2
  *     romfs
  *     cramfs
+ *     squashfs
  *     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)
 {
@@ -75,9 +56,10 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;
+       struct squashfs_super_block *squashfsb;
        int nblocks = -1;
        unsigned char *buf;
-       const struct compress_format *cf;
+       const char *compress_name;
 
        buf = kmalloc(size, GFP_KERNEL);
        if (!buf)
@@ -87,6 +69,7 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;
+       squashfsb = (struct squashfs_super_block *) buf;
        memset(buf, 0xe5, size);
 
        /*
@@ -95,15 +78,16 @@ 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 (compress_name) {
+               printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n",
+                      compress_name, start_block);
+               if (!*decompressor)
+                       printk(KERN_EMERG
+                              "RAMDISK: %s decompressor not configured!\n",
+                              compress_name);
+               nblocks = 0;
+               goto done;
        }
 
        /* romfs is at block zero too */
@@ -124,6 +108,16 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
                goto done;
        }
 
+       /* squashfs is at block zero too */
+       if (le32_to_cpu(squashfsb->s_magic) == SQUASHFS_MAGIC) {
+               printk(KERN_NOTICE
+                      "RAMDISK: squashfs filesystem found at block %d\n",
+                      start_block);
+               nblocks = (le64_to_cpu(squashfsb->bytes_used) + BLOCK_SIZE - 1)
+                        >> BLOCK_SIZE_BITS;
+               goto done;
+       }
+
        /*
         * Read block 1 to test for minix and ext2 superblock
         */