projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
[powerpc.git]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index
679d870
..
f81cfa4
100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-26,10
+26,12
@@
static void __init free(void *where)
/* link hash */
/* link hash */
+#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
+
static __initdata struct hash {
int ino, minor, major;
struct hash *next;
static __initdata struct hash {
int ino, minor, major;
struct hash *next;
- char
*name
;
+ char
name[N_ALIGN(PATH_MAX)]
;
} *head[32];
static inline int hash(int major, int minor, int ino)
} *head[32];
static inline int hash(int major, int minor, int ino)
@@
-57,7
+59,7
@@
static char __init *find_link(int major, int minor, int ino, char *name)
q->ino = ino;
q->minor = minor;
q->major = major;
q->ino = ino;
q->minor = minor;
q->major = major;
-
q->name = name
;
+
strcpy(q->name, name)
;
q->next = NULL;
*p = q;
return NULL;
q->next = NULL;
*p = q;
return NULL;
@@
-133,8
+135,6
@@
static inline void eat(unsigned n)
count -= n;
}
count -= n;
}
-#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
-
static __initdata char *collected;
static __initdata int remains;
static __initdata char *collect;
static __initdata char *collected;
static __initdata int remains;
static __initdata char *collect;