5 files changed, 73 insertions, 37 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a291b7ef4738..44f9ed3dae22 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -783,8 +783,13 @@ endchoice
 
 endmenu # "RCU Subsystem"
 
+config BUILD_BIN2C
+        bool
+        default n
+
 config IKCONFIG
         tristate "Kernel .config support"
+        select BUILD_BIN2C
         ---help---
           This option enables the complete Linux kernel ".config" file
           contents to be saved in the kernel. It provides documentation
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 82f22885c87e..b6237c31b0e2 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -539,12 +539,6 @@ void __init prepare_namespace(void)
 {
         int is_floppy;
 
-        if (root_delay) {
-                printk(KERN_INFO "Waiting %d sec before mounting root device...\n",
-                       root_delay);
-                ssleep(root_delay);
-        }
-
         /*
          * wait for the known devices to complete their probing
          *
@@ -571,6 +565,12 @@ void __init prepare_namespace(void)
         if (initrd_load())
                 goto out;
 
+        if (root_delay) {
+                pr_info("Waiting %d sec before mounting root device...\n",
+                        root_delay);
+                ssleep(root_delay);
+        }
+
         /* wait for any asynchronous scanning to complete */
         if ((ROOT_DEV == 0) && root_wait) {
                 printk(KERN_INFO "Waiting for root device %s...\n",
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index a8227022e3a0..e5d059e8aa11 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -311,9 +311,9 @@ static int exit_code;
 static int decompress_error;
 static int crd_infd, crd_outfd;
 
-static int __init compr_fill(void *buf, unsigned int len)
+static long __init compr_fill(void *buf, unsigned long len)
 {
-        int r = sys_read(crd_infd, buf, len);
+        long r = sys_read(crd_infd, buf, len);
         if (r < 0)
                 printk(KERN_ERR "RAMDISK: error while reading compressed data");
         else if (r == 0)
@@ -321,13 +321,13 @@ static int __init compr_fill(void *buf, unsigned int len)
         return r;
 }
 
-static int __init compr_flush(void *window, unsigned int outcnt)
+static long __init compr_flush(void *window, unsigned long outcnt)
 {
-        int written = sys_write(crd_outfd, window, outcnt);
+        long written = sys_write(crd_outfd, window, outcnt);
         if (written != outcnt) {
                 if (decompress_error == 0)
                         printk(KERN_ERR
-                               "RAMDISK: incomplete write (%d != %d)\n",
+                               "RAMDISK: incomplete write (%ld != %ld)\n",
                                written, outcnt);
                 decompress_error = 1;
                 return -1;
diff --git a/init/initramfs.c b/init/initramfs.c
index a8497fab1c3d..bece48c3461e 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -19,6 +19,29 @@
 #include <linux/syscalls.h>
 #include <linux/utime.h>
 
+static ssize_t __init xwrite(int fd, const char *p, size_t count)
+{
+        ssize_t out = 0;
+
+        /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
+        while (count) {
+                ssize_t rv = sys_write(fd, p, count);
+
+                if (rv < 0) {
+                        if (rv == -EINTR || rv == -EAGAIN)
+                                continue;
+                        return out ? out : rv;
+                } else if (rv == 0)
+                        break;
+
+                p += rv;
+                out += rv;
+                count -= rv;
+        }
+
+        return out;
+}
+
 static __initdata char *message;
 static void __init error(char *x)
 {
@@ -174,7 +197,7 @@ static __initdata enum state {
 } state, next_state;
 
 static __initdata char *victim;
-static __initdata unsigned count;
+static unsigned long count __initdata;
 static __initdata loff_t this_header, next_header;
 
 static inline void __init eat(unsigned n)
@@ -186,7 +209,7 @@ static inline void __init eat(unsigned n)
 
 static __initdata char *vcollected;
 static __initdata char *collected;
-static __initdata int remains;
+static long remains __initdata;
 static __initdata char *collect;
 
 static void __init read_into(char *buf, unsigned size, enum state next)
@@ -213,7 +236,7 @@ static int __init do_start(void)
 
 static int __init do_collect(void)
 {
-        unsigned n = remains;
+        unsigned long n = remains;
         if (count < n)
                 n = count;
         memcpy(collect, victim, n);
@@ -346,7 +369,8 @@ static int __init do_name(void)
 static int __init do_copy(void)
 {
         if (count >= body_len) {
-                sys_write(wfd, victim, body_len);
+                if (xwrite(wfd, victim, body_len) != body_len)
+                        error("write error");
                 sys_close(wfd);
                 do_utime(vcollected, mtime);
                 kfree(vcollected);
@@ -354,7 +378,8 @@ static int __init do_copy(void)
                 state = SkipIt;
                 return 0;
         } else {
-                sys_write(wfd, victim, count);
+                if (xwrite(wfd, victim, count) != count)
+                        error("write error");
                 body_len -= count;
                 eat(count);
                 return 1;
@@ -384,7 +409,7 @@ static __initdata int (*actions[])(void) = {
         [Reset]         = do_reset,
 };
 
-static int __init write_buffer(char *buf, unsigned len)
+static long __init write_buffer(char *buf, unsigned long len)
 {
         count = len;
         victim = buf;
@@ -394,11 +419,11 @@ static int __init write_buffer(char *buf, unsigned len)
         return len - count;
 }
 
-static int __init flush_buffer(void *bufv, unsigned len)
+static long __init flush_buffer(void *bufv, unsigned long len)
 {
         char *buf = (char *) bufv;
-        int written;
-        int origLen = len;
+        long written;
+        long origLen = len;
         if (message)
                 return -1;
         while ((written = write_buffer(buf, len)) < len && !message) {
@@ -417,13 +442,13 @@ static int __init flush_buffer(void *bufv, unsigned len)
         return origLen;
 }