[Bluetooth] Integrate low-level connections into the driver model

[pandora-kernel.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index 77b934c..d28c109 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -26,10 +26,13 @@ static void __init free(void *where)
 
 /* link hash */
 
+#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
+
 static __initdata struct hash {
        int ino, minor, major;
+       mode_t mode;
        struct hash *next;
-       char *name;
+       char name[N_ALIGN(PATH_MAX)];
 } *head[32];
 
 static inline int hash(int major, int minor, int ino)
@@ -39,7 +42,8 @@ static inline int hash(int major, int minor, int ino)
        return tmp & 31;
 }
 
-static char __init *find_link(int major, int minor, int ino, char *name)
+static char __init *find_link(int major, int minor, int ino,
+                             mode_t mode, char *name)
 {
        struct hash **p, *q;
        for (p = head + hash(major, minor, ino); *p; p = &(*p)->next) {
@@ -49,15 +53,18 @@ static char __init *find_link(int major, int minor, int ino, char *name)
                        continue;
                if ((*p)->major != major)
                        continue;
+               if (((*p)->mode ^ mode) & S_IFMT)
+                       continue;
                return (*p)->name;
        }
        q = (struct hash *)malloc(sizeof(struct hash));
        if (!q)
                panic("can't allocate link hash entry");
-       q->ino = ino;
-       q->minor = minor;
        q->major = major;
-       q->name = name;
+       q->minor = minor;
+       q->ino = ino;
+       q->mode = mode;
+       strcpy(q->name, name);
        q->next = NULL;
        *p = q;
        return NULL;
@@ -133,8 +140,6 @@ static inline void eat(unsigned n)
        count -= n;
 }
 
-#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
-
 static __initdata char *collected;
 static __initdata int remains;
 static __initdata char *collect;
@@ -229,13 +234,25 @@ static int __init do_reset(void)
 static int __init maybe_link(void)
 {
        if (nlink >= 2) {
-               char *old = find_link(major, minor, ino, collected);
+               char *old = find_link(major, minor, ino, mode, collected);
                if (old)
                        return (sys_link(old, collected) < 0) ? -1 : 1;
        }
        return 0;
 }
 
+static void __init clean_path(char *path, mode_t mode)
+{
+       struct stat st;
+
+       if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
+               if (S_ISDIR(st.st_mode))
+                       sys_rmdir(path);
+               else
+                       sys_unlink(path);
+       }
+}
+
 static __initdata int wfd;
 
 static int __init do_name(void)
@@ -248,9 +265,15 @@ static int __init do_name(void)
        }
        if (dry_run)
                return 0;
+       clean_path(collected, mode);
        if (S_ISREG(mode)) {
-               if (maybe_link() >= 0) {
-                       wfd = sys_open(collected, O_WRONLY|O_CREAT, mode);
+               int ml = maybe_link();
+               if (ml >= 0) {
+                       int openflags = O_WRONLY|O_CREAT;
+                       if (ml != 1)
+                               openflags |= O_TRUNC;
+                       wfd = sys_open(collected, openflags, mode);
+
                        if (wfd >= 0) {
                                sys_fchown(wfd, uid, gid);
                                sys_fchmod(wfd, mode);
@@ -291,6 +314,7 @@ static int __init do_copy(void)
 static int __init do_symlink(void)
 {
        collected[N_ALIGN(name_len) + body_len] = '\0';
+       clean_path(collected, 0);
        sys_symlink(collected + N_ALIGN(name_len), collected);
        sys_lchown(collected, uid, gid);
        state = SkipIt;
@@ -519,7 +543,7 @@ void __init populate_rootfs(void)
                        return;
                }
                printk("it isn't (%s); looks like an initrd\n", err);
-               fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 700);
+               fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
                if (fd >= 0) {
                        sys_write(fd, (char *)initrd_start,
                                        initrd_end - initrd_start);