diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 04:34:13 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:14 -0500 |
commit | 685dd2d5bea3e6368cea8002caf404d1b0b5c9f1 (patch) | |
tree | 3b8256235c4d9f9762a9682506d7e8f9024f585a /init/initramfs.c | |
parent | f69aac0006c303a98da9d2db04b71fd1c600d503 (diff) |
init/initramfs.c: should use umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'init/initramfs.c')
-rw-r--r-- | init/initramfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 2531811d42cb..8216c303b082 100644 --- a/init/initramfs.c +++ b/init/initramfs.c | |||
@@ -22,7 +22,7 @@ static void __init error(char *x) | |||
22 | 22 | ||
23 | static __initdata struct hash { | 23 | static __initdata struct hash { |
24 | int ino, minor, major; | 24 | int ino, minor, major; |
25 | mode_t mode; | 25 | umode_t mode; |
26 | struct hash *next; | 26 | struct hash *next; |
27 | char name[N_ALIGN(PATH_MAX)]; | 27 | char name[N_ALIGN(PATH_MAX)]; |
28 | } *head[32]; | 28 | } *head[32]; |
@@ -35,7 +35,7 @@ static inline int hash(int major, int minor, int ino) | |||
35 | } | 35 | } |
36 | 36 | ||
37 | static char __init *find_link(int major, int minor, int ino, | 37 | static char __init *find_link(int major, int minor, int ino, |
38 | mode_t mode, char *name) | 38 | umode_t mode, char *name) |
39 | { | 39 | { |
40 | struct hash **p, *q; | 40 | struct hash **p, *q; |
41 | for (p = head + hash(major, minor, ino); *p; p = &(*p)->next) { | 41 | for (p = head + hash(major, minor, ino); *p; p = &(*p)->next) { |
@@ -120,7 +120,7 @@ static __initdata time_t mtime; | |||
120 | /* cpio header parsing */ | 120 | /* cpio header parsing */ |
121 | 121 | ||
122 | static __initdata unsigned long ino, major, minor, nlink; | 122 | static __initdata unsigned long ino, major, minor, nlink; |
123 | static __initdata mode_t mode; | 123 | static __initdata umode_t mode; |
124 | static __initdata unsigned long body_len, name_len; | 124 | static __initdata unsigned long body_len, name_len; |
125 | static __initdata uid_t uid; | 125 | static __initdata uid_t uid; |
126 | static __initdata gid_t gid; | 126 | static __initdata gid_t gid; |
@@ -276,7 +276,7 @@ static int __init maybe_link(void) | |||
276 | return 0; | 276 | return 0; |
277 | } | 277 | } |
278 | 278 | ||
279 | static void __init clean_path(char *path, mode_t mode) | 279 | static void __init clean_path(char *path, umode_t mode) |
280 | { | 280 | { |
281 | struct stat st; | 281 | struct stat st; |
282 | 282 | ||