linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index 20bd855..07cd51c 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -26,7 +26,7 @@ static void __init free(void *where)
 
 /* link hash */
 
-static struct hash {
+static __initdata struct hash {
        int ino, minor, major;
        struct hash *next;
        char *name;
@@ -241,15 +241,15 @@ static __initdata int wfd;
 static int __init do_name(void)
 {
        state = SkipIt;
-       next_state = Start;
+       next_state = Reset;
        if (strcmp(collected, "TRAILER!!!") == 0) {
                free_hash();
-               next_state = Reset;
                return 0;
        }
        if (dry_run)
                return 0;
        if (S_ISREG(mode)) {
+               sys_unlink(collected);
                if (maybe_link() >= 0) {
                        wfd = sys_open(collected, O_WRONLY|O_CREAT, mode);
                        if (wfd >= 0) {
@@ -264,6 +264,7 @@ static int __init do_name(void)
                sys_chmod(collected, mode);
        } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
                   S_ISFIFO(mode) || S_ISSOCK(mode)) {
+               sys_unlink(collected);
                if (maybe_link() == 0) {
                        sys_mknod(collected, mode, rdev);
                        sys_chown(collected, uid, gid);
@@ -292,10 +293,11 @@ static int __init do_copy(void)
 static int __init do_symlink(void)
 {
        collected[N_ALIGN(name_len) + body_len] = '\0';
+       sys_unlink(collected);
        sys_symlink(collected + N_ALIGN(name_len), collected);
        sys_lchown(collected, uid, gid);
        state = SkipIt;
-       next_state = Start;
+       next_state = Reset;
        return 0;
 }
 
@@ -331,6 +333,10 @@ static void __init flush_buffer(char *buf, unsigned len)
                        buf += written;
                        len -= written;
                        state = Start;
+               } else if (c == 0) {
+                       buf += written;
+                       len -= written;
+                       state = Reset;
                } else
                        error("junk in compressed archive");
        }
@@ -372,11 +378,12 @@ static long bytes_out;
 #define Tracecv(c,x)
 
 #define STATIC static
+#define INIT __init
 
-static void flush_window(void);
-static void error(char *m);
-static void gzip_mark(void **);
-static void gzip_release(void **);
+static void __init flush_window(void);
+static void __init error(char *m);
+static void __init gzip_mark(void **);
+static void __init gzip_release(void **);
 
 #include "../lib/inflate.c"
 
@@ -409,7 +416,7 @@ static void __init flush_window(void)
        outcnt = 0;
 }
 
-char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
+static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
 {
        int written;
        dry_run = check_only;
@@ -445,8 +452,7 @@ char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
                bytes_out = 0;
                crc = (ulg)0xffffffffL; /* shift register contents */
                makecrc();
-               if (gunzip())
-                       message = "ungzip failed";
+               gunzip();
                if (state != Reset)
                        error("junk in gzipped archive");
                this_header = saved_offset + inptr;
@@ -460,15 +466,45 @@ char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
        return message;
 }
 
-extern char __initramfs_start, __initramfs_end;
+extern char __initramfs_start[], __initramfs_end[];
 #ifdef CONFIG_BLK_DEV_INITRD
 #include <linux/initrd.h>
+#include <linux/kexec.h>
+
+static void __init free_initrd(void)
+{
+#ifdef CONFIG_KEXEC
+       unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
+       unsigned long crashk_end   = (unsigned long)__va(crashk_res.end);
+
+       /*
+        * If the initrd region is overlapped with crashkernel reserved region,
+        * free only memory that is not part of crashkernel region.
+        */
+       if (initrd_start < crashk_end && initrd_end > crashk_start) {
+               /*
+                * Initialize initrd memory region since the kexec boot does
+                * not do.
+                */
+               memset((void *)initrd_start, 0, initrd_end - initrd_start);
+               if (initrd_start < crashk_start)
+                       free_initrd_mem(initrd_start, crashk_start);
+               if (initrd_end > crashk_end)
+                       free_initrd_mem(crashk_end, initrd_end);
+       } else
+#endif
+               free_initrd_mem(initrd_start, initrd_end);
+
+       initrd_start = 0;
+       initrd_end = 0;
+}
+
 #endif
 
 void __init populate_rootfs(void)
 {
-       char *err = unpack_to_rootfs(&__initramfs_start,
-                        &__initramfs_end - &__initramfs_start, 0);
+       char *err = unpack_to_rootfs(__initramfs_start,
+                        __initramfs_end - __initramfs_start, 0);
        if (err)
                panic(err);
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -481,7 +517,7 @@ void __init populate_rootfs(void)
                        printk(" it is\n");
                        unpack_to_rootfs((char *)initrd_start,
                                initrd_end - initrd_start, 0);
-                       free_initrd_mem(initrd_start, initrd_end);
+                       free_initrd();
                        return;
                }
                printk("it isn't (%s); looks like an initrd\n", err);
@@ -490,7 +526,7 @@ void __init populate_rootfs(void)
                        sys_write(fd, (char *)initrd_start,
                                        initrd_end - initrd_start);
                        sys_close(fd);
-                       free_initrd_mem(initrd_start, initrd_end);
+                       free_initrd();
                }
        }
 #endif