Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26705
b: refs/heads/master
c: 6a050da
h: refs/heads/master
i:
  26703: 635d11b
v: v3
  • Loading branch information
Mark Huang authored and Linus Torvalds committed May 15, 2006
1 parent d6aa864 commit 374917c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8
refs/heads/master: 6a050da45b5d855b48b057446847ff1542977b52
8 changes: 4 additions & 4 deletions trunk/init/initramfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ static void __init free(void *where)

/* link hash */

#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)

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)
Expand Down Expand Up @@ -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->name = name;
strcpy(q->name, name);
q->next = NULL;
*p = q;
return NULL;
Expand Down Expand Up @@ -133,8 +135,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;
Expand Down

0 comments on commit 374917c

Please sign in to comment.