1 files changed, 8 insertions, 4 deletions

diff --git a/init/initramfs.c b/init/initramfs.c
index 619c1baf7701..9ee7b7810417 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -310,7 +310,8 @@ static int __init do_name(void)
                         if (wfd >= 0) {
                                 sys_fchown(wfd, uid, gid);
                                 sys_fchmod(wfd, mode);
-                                sys_ftruncate(wfd, body_len);
+                                if (body_len)
+                                        sys_ftruncate(wfd, body_len);
                                 vcollected = kstrdup(collected, GFP_KERNEL);
                                 state = CopyFile;
                         }
@@ -515,6 +516,7 @@ skip:
         initrd_end = 0;
 }
 
+#ifdef CONFIG_BLK_DEV_RAM
 #define BUF_SIZE 1024
 static void __init clean_rootfs(void)
 {
@@ -561,6 +563,7 @@ static void __init clean_rootfs(void)
         sys_close(fd);
         kfree(buf);
 }
+#endif
 
 static int __init populate_rootfs(void)
 {
@@ -571,11 +574,11 @@ static int __init populate_rootfs(void)
         if (initrd_start) {
 #ifdef CONFIG_BLK_DEV_RAM
                 int fd;
-                printk(KERN_INFO "checking if image is initramfs...");
+                printk(KERN_INFO "checking if image is initramfs...\n");
                 err = unpack_to_rootfs((char *)initrd_start,
                         initrd_end - initrd_start);
                 if (!err) {
-                        printk(" it is\n");
+                        printk(KERN_INFO "rootfs image is initramfs; unpacking...\n");
                         free_initrd();
                         return 0;
                 } else {
@@ -583,7 +586,8 @@ static int __init populate_rootfs(void)
                         unpack_to_rootfs(__initramfs_start,
                                  __initramfs_end - __initramfs_start);
                 }
-                printk("it isn't (%s); looks like an initrd\n", err);
+                printk(KERN_INFO "rootfs image is not initramfs (%s)"
+                                "; looks like an initrd\n", err);
                 fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
                 if (fd >= 0) {
                         sys_write(fd, (char *)initrd_start,