diff options
author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
tree | 06a3183a562f8da4688f65023f7a18dcad702956 /fs/openpromfs/inode.c | |
parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'fs/openpromfs/inode.c')
-rw-r--r-- | fs/openpromfs/inode.c | 1160 |
1 files changed, 259 insertions, 901 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index 0f14276a2e51..93a56bd4a2b7 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* $Id: inode.c,v 1.15 2001/11/12 09:43:39 davem Exp $ | 1 | /* inode.c: /proc/openprom handling routines |
2 | * openpromfs.c: /proc/openprom handling routines | ||
3 | * | 2 | * |
4 | * Copyright (C) 1996-1999 Jakub Jelinek (jakub@redhat.com) | 3 | * Copyright (C) 1996-1999 Jakub Jelinek (jakub@redhat.com) |
5 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) |
@@ -12,756 +11,245 @@ | |||
12 | #include <linux/openprom_fs.h> | 11 | #include <linux/openprom_fs.h> |
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
15 | #include <linux/smp_lock.h> | 14 | #include <linux/seq_file.h> |
16 | 15 | ||
17 | #include <asm/openprom.h> | 16 | #include <asm/openprom.h> |
18 | #include <asm/oplib.h> | 17 | #include <asm/oplib.h> |
18 | #include <asm/prom.h> | ||
19 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
20 | 20 | ||
21 | #define ALIASES_NNODES 64 | 21 | static DEFINE_MUTEX(op_mutex); |
22 | 22 | ||
23 | typedef struct { | 23 | #define OPENPROM_ROOT_INO 0 |
24 | u16 parent; | 24 | |
25 | u16 next; | 25 | enum op_inode_type { |
26 | u16 child; | 26 | op_inode_node, |
27 | u16 first_prop; | 27 | op_inode_prop, |
28 | u32 node; | 28 | }; |
29 | } openpromfs_node; | 29 | |
30 | 30 | union op_inode_data { | |
31 | typedef struct { | 31 | struct device_node *node; |
32 | #define OPP_STRING 0x10 | 32 | struct property *prop; |
33 | #define OPP_STRINGLIST 0x20 | 33 | }; |
34 | #define OPP_BINARY 0x40 | ||
35 | #define OPP_HEXSTRING 0x80 | ||
36 | #define OPP_DIRTY 0x01 | ||
37 | #define OPP_QUOTED 0x02 | ||
38 | #define OPP_NOTQUOTED 0x04 | ||
39 | #define OPP_ASCIIZ 0x08 | ||
40 | u32 flag; | ||
41 | u32 alloclen; | ||
42 | u32 len; | ||
43 | char *value; | ||
44 | char name[8]; | ||
45 | } openprom_property; | ||
46 | |||
47 | static openpromfs_node *nodes; | ||
48 | static int alloced; | ||
49 | static u16 last_node; | ||
50 | static u16 first_prop; | ||
51 | static u16 options = 0xffff; | ||
52 | static u16 aliases = 0xffff; | ||
53 | static int aliases_nodes; | ||
54 | static char *alias_names [ALIASES_NNODES]; | ||
55 | |||
56 | #define OPENPROM_ROOT_INO 16 | ||
57 | #define OPENPROM_FIRST_INO OPENPROM_ROOT_INO | ||
58 | #define NODE(ino) nodes[ino - OPENPROM_FIRST_INO] | ||
59 | #define NODE2INO(node) (node + OPENPROM_FIRST_INO) | ||
60 | #define NODEP2INO(no) (no + OPENPROM_FIRST_INO + last_node) | ||
61 | |||
62 | static int openpromfs_create (struct inode *, struct dentry *, int, struct nameidata *); | ||
63 | static int openpromfs_readdir(struct file *, void *, filldir_t); | ||
64 | static struct dentry *openpromfs_lookup(struct inode *, struct dentry *dentry, struct nameidata *nd); | ||
65 | static int openpromfs_unlink (struct inode *, struct dentry *dentry); | ||
66 | 34 | ||
67 | static ssize_t nodenum_read(struct file *file, char __user *buf, | 35 | struct op_inode_info { |
68 | size_t count, loff_t *ppos) | 36 | struct inode vfs_inode; |
37 | enum op_inode_type type; | ||
38 | union op_inode_data u; | ||
39 | }; | ||
40 | |||
41 | static inline struct op_inode_info *OP_I(struct inode *inode) | ||
69 | { | 42 | { |
70 | struct inode *inode = file->f_dentry->d_inode; | 43 | return container_of(inode, struct op_inode_info, vfs_inode); |
71 | char buffer[10]; | ||
72 | |||
73 | if (count < 0 || !inode->u.generic_ip) | ||
74 | return -EINVAL; | ||
75 | sprintf (buffer, "%8.8x\n", (u32)(long)(inode->u.generic_ip)); | ||
76 | if (file->f_pos >= 9) | ||
77 | return 0; | ||
78 | if (count > 9 - file->f_pos) | ||
79 | count = 9 - file->f_pos; | ||
80 | if (copy_to_user(buf, buffer + file->f_pos, count)) | ||
81 | return -EFAULT; | ||
82 | *ppos += count; | ||
83 | return count; | ||
84 | } | 44 | } |
85 | 45 | ||
86 | static ssize_t property_read(struct file *filp, char __user *buf, | 46 | static int is_string(unsigned char *p, int len) |
87 | size_t count, loff_t *ppos) | ||
88 | { | 47 | { |
89 | struct inode *inode = filp->f_dentry->d_inode; | 48 | int i; |
90 | int i, j, k; | ||
91 | u32 node; | ||
92 | char *p, *s; | ||
93 | u32 *q; | ||
94 | openprom_property *op; | ||
95 | char buffer[64]; | ||
96 | |||
97 | if (!filp->private_data) { | ||
98 | node = nodes[(u16)((long)inode->u.generic_ip)].node; | ||
99 | i = ((u32)(long)inode->u.generic_ip) >> 16; | ||
100 | if ((u16)((long)inode->u.generic_ip) == aliases) { | ||
101 | if (i >= aliases_nodes) | ||
102 | p = NULL; | ||
103 | else | ||
104 | p = alias_names [i]; | ||
105 | } else | ||
106 | for (p = prom_firstprop (node, buffer); | ||
107 | i && p && *p; | ||
108 | p = prom_nextprop (node, p, buffer), i--) | ||
109 | /* nothing */ ; | ||
110 | if (!p || !*p) | ||
111 | return -EIO; | ||
112 | i = prom_getproplen (node, p); | ||
113 | if (i < 0) { | ||
114 | if ((u16)((long)inode->u.generic_ip) == aliases) | ||
115 | i = 0; | ||
116 | else | ||
117 | return -EIO; | ||
118 | } | ||
119 | k = i; | ||
120 | if (i < 64) i = 64; | ||
121 | filp->private_data = kmalloc (sizeof (openprom_property) | ||
122 | + (j = strlen (p)) + 2 * i, | ||
123 | GFP_KERNEL); | ||
124 | if (!filp->private_data) | ||
125 | return -ENOMEM; | ||
126 | op = (openprom_property *)filp->private_data; | ||
127 | op->flag = 0; | ||
128 | op->alloclen = 2 * i; | ||
129 | strcpy (op->name, p); | ||
130 | op->value = (char *)(((unsigned long)(op->name + j + 4)) & ~3); | ||
131 | op->len = k; | ||
132 | if (k && prom_getproperty (node, p, op->value, i) < 0) | ||
133 | return -EIO; | ||
134 | op->value [k] = 0; | ||
135 | if (k) { | ||
136 | for (s = NULL, p = op->value; p < op->value + k; p++) { | ||
137 | if ((*p >= ' ' && *p <= '~') || *p == '\n') { | ||
138 | op->flag |= OPP_STRING; | ||
139 | s = p; | ||
140 | continue; | ||
141 | } | ||
142 | if (p > op->value && !*p && s == p - 1) { | ||
143 | if (p < op->value + k - 1) | ||
144 | op->flag |= OPP_STRINGLIST; | ||
145 | else | ||
146 | op->flag |= OPP_ASCIIZ; | ||
147 | continue; | ||
148 | } | ||
149 | if (k == 1 && !*p) { | ||
150 | op->flag |= (OPP_STRING|OPP_ASCIIZ); | ||
151 | break; | ||
152 | } | ||
153 | op->flag &= ~(OPP_STRING|OPP_STRINGLIST); | ||
154 | if (k & 3) | ||
155 | op->flag |= OPP_HEXSTRING; | ||
156 | else | ||
157 | op->flag |= OPP_BINARY; | ||
158 | break; | ||
159 | } | ||
160 | if (op->flag & OPP_STRINGLIST) | ||
161 | op->flag &= ~(OPP_STRING); | ||
162 | if (op->flag & OPP_ASCIIZ) | ||
163 | op->len--; | ||
164 | } | ||
165 | } else | ||
166 | op = (openprom_property *)filp->private_data; | ||
167 | if (!count || !(op->len || (op->flag & OPP_ASCIIZ))) | ||
168 | return 0; | ||
169 | if (*ppos >= 0xffffff || count >= 0xffffff) | ||
170 | return -EINVAL; | ||
171 | if (op->flag & OPP_STRINGLIST) { | ||
172 | for (k = 0, p = op->value; p < op->value + op->len; p++) | ||
173 | if (!*p) | ||
174 | k++; | ||
175 | i = op->len + 4 * k + 3; | ||
176 | } else if (op->flag & OPP_STRING) { | ||
177 | i = op->len + 3; | ||
178 | } else if (op->flag & OPP_BINARY) { | ||
179 | i = (op->len * 9) >> 2; | ||
180 | } else { | ||
181 | i = (op->len << 1) + 1; | ||
182 | } | ||
183 | k = *ppos; | ||
184 | if (k >= i) return 0; | ||
185 | if (count > i - k) count = i - k; | ||
186 | if (op->flag & OPP_STRING) { | ||
187 | if (!k) { | ||
188 | if (put_user('\'', buf)) | ||
189 | return -EFAULT; | ||
190 | k++; | ||
191 | count--; | ||
192 | } | ||
193 | 49 | ||
194 | if (k + count >= i - 2) | 50 | for (i = 0; i < len; i++) { |
195 | j = i - 2 - k; | 51 | unsigned char val = p[i]; |
196 | else | ||
197 | j = count; | ||
198 | |||
199 | if (j >= 0) { | ||
200 | if (copy_to_user(buf + k - *ppos, | ||
201 | op->value + k - 1, j)) | ||
202 | return -EFAULT; | ||
203 | count -= j; | ||
204 | k += j; | ||
205 | } | ||
206 | 52 | ||
207 | if (count) { | 53 | if ((i && !val) || |
208 | if (put_user('\'', &buf [k++ - *ppos])) | 54 | (val >= ' ' && val <= '~')) |
209 | return -EFAULT; | 55 | continue; |
210 | } | ||
211 | if (count > 1) { | ||
212 | if (put_user('\n', &buf [k++ - *ppos])) | ||
213 | return -EFAULT; | ||
214 | } | ||
215 | } else if (op->flag & OPP_STRINGLIST) { | ||
216 | char *tmp; | ||
217 | |||
218 | tmp = kmalloc (i, GFP_KERNEL); | ||
219 | if (!tmp) | ||
220 | return -ENOMEM; | ||
221 | |||
222 | s = tmp; | ||
223 | *s++ = '\''; | ||
224 | for (p = op->value; p < op->value + op->len; p++) { | ||
225 | if (!*p) { | ||
226 | strcpy(s, "' + '"); | ||
227 | s += 5; | ||
228 | continue; | ||
229 | } | ||
230 | *s++ = *p; | ||
231 | } | ||
232 | strcpy(s, "'\n"); | ||
233 | |||
234 | if (copy_to_user(buf, tmp + k, count)) | ||
235 | return -EFAULT; | ||
236 | |||
237 | kfree(tmp); | ||
238 | k += count; | ||
239 | |||
240 | } else if (op->flag & OPP_BINARY) { | ||
241 | char buffer[10]; | ||
242 | u32 *first, *last; | ||
243 | int first_off, last_cnt; | ||
244 | |||
245 | first = ((u32 *)op->value) + k / 9; | ||
246 | first_off = k % 9; | ||
247 | last = ((u32 *)op->value) + (k + count - 1) / 9; | ||
248 | last_cnt = (k + count) % 9; | ||
249 | if (!last_cnt) last_cnt = 9; | ||
250 | |||
251 | if (first == last) { | ||
252 | sprintf (buffer, "%08x.", *first); | ||
253 | if (copy_to_user(buf, buffer + first_off, | ||
254 | last_cnt - first_off)) | ||
255 | return -EFAULT; | ||
256 | buf += last_cnt - first_off; | ||
257 | } else { | ||
258 | for (q = first; q <= last; q++) { | ||
259 | sprintf (buffer, "%08x.", *q); | ||
260 | if (q == first) { | ||
261 | if (copy_to_user(buf, buffer + first_off, | ||
262 | 9 - first_off)) | ||
263 | return -EFAULT; | ||
264 | buf += 9 - first_off; | ||
265 | } else if (q == last) { | ||
266 | if (copy_to_user(buf, buffer, last_cnt)) | ||
267 | return -EFAULT; | ||
268 | buf += last_cnt; | ||
269 | } else { | ||
270 | if (copy_to_user(buf, buffer, 9)) | ||
271 | return -EFAULT; | ||
272 | buf += 9; | ||
273 | } | ||
274 | } | ||
275 | } | ||
276 | 56 | ||
277 | if (last == (u32 *)(op->value + op->len - 4) && last_cnt == 9) { | 57 | return 0; |
278 | if (put_user('\n', (buf - 1))) | 58 | } |
279 | return -EFAULT; | ||
280 | } | ||
281 | 59 | ||
282 | k += count; | 60 | return 1; |
61 | } | ||
283 | 62 | ||
284 | } else if (op->flag & OPP_HEXSTRING) { | 63 | static int property_show(struct seq_file *f, void *v) |
285 | char buffer[3]; | 64 | { |
65 | struct property *prop = f->private; | ||
66 | void *pval; | ||
67 | int len; | ||
286 | 68 | ||
287 | if ((k < i - 1) && (k & 1)) { | 69 | len = prop->length; |
288 | sprintf (buffer, "%02x", | 70 | pval = prop->value; |
289 | (unsigned char) *(op->value + (k >> 1)) & 0xff); | ||
290 | if (put_user(buffer[1], &buf[k++ - *ppos])) | ||
291 | return -EFAULT; | ||
292 | count--; | ||
293 | } | ||
294 | 71 | ||
295 | for (; (count > 1) && (k < i - 1); k += 2) { | 72 | if (is_string(pval, len)) { |
296 | sprintf (buffer, "%02x", | 73 | while (len > 0) { |
297 | (unsigned char) *(op->value + (k >> 1)) & 0xff); | 74 | int n = strlen(pval); |
298 | if (copy_to_user(buf + k - *ppos, buffer, 2)) | ||
299 | return -EFAULT; | ||
300 | count -= 2; | ||
301 | } | ||
302 | 75 | ||
303 | if (count && (k < i - 1)) { | 76 | seq_printf(f, "%s", (char *) pval); |
304 | sprintf (buffer, "%02x", | ||
305 | (unsigned char) *(op->value + (k >> 1)) & 0xff); | ||
306 | if (put_user(buffer[0], &buf[k++ - *ppos])) | ||
307 | return -EFAULT; | ||
308 | count--; | ||
309 | } | ||
310 | 77 | ||
311 | if (count) { | 78 | /* Skip over the NULL byte too. */ |
312 | if (put_user('\n', &buf [k++ - *ppos])) | 79 | pval += n + 1; |
313 | return -EFAULT; | 80 | len -= n + 1; |
314 | } | ||
315 | } | ||
316 | count = k - *ppos; | ||
317 | *ppos = k; | ||
318 | return count; | ||
319 | } | ||
320 | 81 | ||
321 | static ssize_t property_write(struct file *filp, const char __user *buf, | 82 | if (len > 0) |
322 | size_t count, loff_t *ppos) | 83 | seq_printf(f, " + "); |
323 | { | ||
324 | int i, j, k; | ||
325 | char *p; | ||
326 | u32 *q; | ||
327 | void *b; | ||
328 | openprom_property *op; | ||
329 | |||
330 | if (*ppos >= 0xffffff || count >= 0xffffff) | ||
331 | return -EINVAL; | ||
332 | if (!filp->private_data) { | ||
333 | i = property_read (filp, NULL, 0, NULL); | ||
334 | if (i) | ||
335 | return i; | ||
336 | } | ||
337 | k = *ppos; | ||
338 | op = (openprom_property *)filp->private_data; | ||
339 | if (!(op->flag & OPP_STRING)) { | ||
340 | u32 *first, *last; | ||
341 | int first_off, last_cnt; | ||
342 | u32 mask, mask2; | ||
343 | char tmp [9]; | ||
344 | int forcelen = 0; | ||
345 | |||
346 | j = k % 9; | ||
347 | for (i = 0; i < count; i++, j++) { | ||
348 | if (j == 9) j = 0; | ||
349 | if (!j) { | ||
350 | char ctmp; | ||
351 | if (get_user(ctmp, &buf[i])) | ||
352 | return -EFAULT; | ||
353 | if (ctmp != '.') { | ||
354 | if (ctmp != '\n') { | ||
355 | if (op->flag & OPP_BINARY) | ||
356 | return -EINVAL; | ||
357 | else | ||
358 | goto write_try_string; | ||
359 | } else { | ||
360 | count = i + 1; | ||
361 | forcelen = 1; | ||
362 | break; | ||
363 | } | ||
364 | } | ||
365 | } else { | ||
366 | char ctmp; | ||
367 | if (get_user(ctmp, &buf[i])) | ||
368 | return -EFAULT; | ||
369 | if (ctmp < '0' || | ||
370 | (ctmp > '9' && ctmp < 'A') || | ||
371 | (ctmp > 'F' && ctmp < 'a') || | ||
372 | ctmp > 'f') { | ||
373 | if (op->flag & OPP_BINARY) | ||
374 | return -EINVAL; | ||
375 | else | ||
376 | goto write_try_string; | ||
377 | } | ||
378 | } | ||
379 | } | ||
380 | op->flag |= OPP_BINARY; | ||
381 | tmp [8] = 0; | ||
382 | i = ((count + k + 8) / 9) << 2; | ||
383 | if (op->alloclen <= i) { | ||
384 | b = kmalloc (sizeof (openprom_property) + 2 * i, | ||
385 | GFP_KERNEL); | ||
386 | if (!b) | ||
387 | return -ENOMEM; | ||
388 | memcpy (b, filp->private_data, | ||
389 | sizeof (openprom_property) | ||
390 | + strlen (op->name) + op->alloclen); | ||
391 | memset (((char *)b) + sizeof (openprom_property) | ||
392 | + strlen (op->name) + op->alloclen, | ||
393 | 0, 2 * i - op->alloclen); | ||
394 | op = (openprom_property *)b; | ||
395 | op->alloclen = 2*i; | ||
396 | b = filp->private_data; | ||
397 | filp->private_data = (void *)op; | ||
398 | kfree (b); | ||
399 | } | 84 | } |
400 | first = ((u32 *)op->value) + (k / 9); | 85 | } else { |
401 | first_off = k % 9; | 86 | if (len & 3) { |
402 | last = (u32 *)(op->value + i); | 87 | while (len) { |
403 | last_cnt = (k + count) % 9; | 88 | len--; |
404 | if (first + 1 == last) { | 89 | if (len) |
405 | memset (tmp, '0', 8); | 90 | seq_printf(f, "%02x.", |
406 | if (copy_from_user(tmp + first_off, buf, | 91 | *(unsigned char *) pval); |
407 | (count + first_off > 8) ? | 92 | else |
408 | 8 - first_off : count)) | 93 | seq_printf(f, "%02x", |
409 | return -EFAULT; | 94 | *(unsigned char *) pval); |
410 | mask = 0xffffffff; | 95 | pval++; |
411 | mask2 = 0xffffffff; | ||
412 | for (j = 0; j < first_off; j++) | ||
413 | mask >>= 1; | ||
414 | for (j = 8 - count - first_off; j > 0; j--) | ||
415 | mask2 <<= 1; | ||
416 | mask &= mask2; | ||
417 | if (mask) { | ||
418 | *first &= ~mask; | ||
419 | *first |= simple_strtoul (tmp, NULL, 16); | ||
420 | op->flag |= OPP_DIRTY; | ||
421 | } | 96 | } |
422 | } else { | 97 | } else { |
423 | op->flag |= OPP_DIRTY; | 98 | while (len >= 4) { |
424 | for (q = first; q < last; q++) { | 99 | len -= 4; |
425 | if (q == first) { | 100 | |
426 | if (first_off < 8) { | 101 | if (len) |
427 | memset (tmp, '0', 8); | 102 | seq_printf(f, "%08x.", |
428 | if (copy_from_user(tmp + first_off, | 103 | *(unsigned int *) pval); |
429 | buf, | 104 | else |
430 | 8 - first_off)) | 105 | seq_printf(f, "%08x", |
431 | return -EFAULT; | 106 | *(unsigned int *) pval); |
432 | mask = 0xffffffff; | 107 | pval += 4; |
433 | for (j = 0; j < first_off; j++) | ||
434 | mask >>= 1; | ||
435 | *q &= ~mask; | ||
436 | *q |= simple_strtoul (tmp,NULL,16); | ||
437 | } | ||
438 | buf += 9; | ||
439 | } else if ((q == last - 1) && last_cnt | ||
440 | && (last_cnt < 8)) { | ||
441 | memset (tmp, '0', 8); | ||
442 | if (copy_from_user(tmp, buf, last_cnt)) | ||
443 | return -EFAULT; | ||
444 | mask = 0xffffffff; | ||
445 | for (j = 0; j < 8 - last_cnt; j++) | ||
446 | mask <<= 1; | ||
447 | *q &= ~mask; | ||
448 | *q |= simple_strtoul (tmp, NULL, 16); | ||
449 | buf += last_cnt; | ||
450 | } else { | ||
451 | char tchars[17]; /* XXX yuck... */ | ||
452 | |||
453 | if (copy_from_user(tchars, buf, 16)) | ||
454 | return -EFAULT; | ||
455 | *q = simple_strtoul (tchars, NULL, 16); | ||
456 | buf += 9; | ||
457 | } | ||
458 | } | ||
459 | } | ||
460 | if (!forcelen) { | ||
461 | if (op->len < i) | ||
462 | op->len = i; | ||
463 | } else | ||
464 | op->len = i; | ||
465 | *ppos += count; | ||
466 | } | ||
467 | write_try_string: | ||
468 | if (!(op->flag & OPP_BINARY)) { | ||
469 | if (!(op->flag & (OPP_QUOTED | OPP_NOTQUOTED))) { | ||
470 | char ctmp; | ||
471 | |||
472 | /* No way, if somebody starts writing from the middle, | ||
473 | * we don't know whether he uses quotes around or not | ||
474 | */ | ||
475 | if (k > 0) | ||
476 | return -EINVAL; | ||
477 | if (get_user(ctmp, buf)) | ||
478 | return -EFAULT; | ||
479 | if (ctmp == '\'') { | ||
480 | op->flag |= OPP_QUOTED; | ||
481 | buf++; | ||
482 | count--; | ||
483 | (*ppos)++; | ||
484 | if (!count) { | ||
485 | op->flag |= OPP_STRING; | ||
486 | return 1; | ||
487 | } | ||
488 | } else | ||
489 | op->flag |= OPP_NOTQUOTED; | ||
490 | } | ||
491 | op->flag |= OPP_STRING; | ||
492 | if (op->alloclen <= count + *ppos) { | ||
493 | b = kmalloc (sizeof (openprom_property) | ||
494 | + 2 * (count + *ppos), GFP_KERNEL); | ||
495 | if (!b) | ||
496 | return -ENOMEM; | ||
497 | memcpy (b, filp->private_data, | ||
498 | sizeof (openprom_property) | ||
499 | + strlen (op->name) + op->alloclen); | ||
500 | memset (((char *)b) + sizeof (openprom_property) | ||
501 | + strlen (op->name) + op->alloclen, | ||
502 | 0, 2*(count - *ppos) - op->alloclen); | ||
503 | op = (openprom_property *)b; | ||
504 | op->alloclen = 2*(count + *ppos); | ||
505 | b = filp->private_data; | ||
506 | filp->private_data = (void *)op; | ||
507 | kfree (b); | ||
508 | } | ||
509 | p = op->value + *ppos - ((op->flag & OPP_QUOTED) ? 1 : 0); | ||
510 | if (copy_from_user(p, buf, count)) | ||
511 | return -EFAULT; | ||
512 | op->flag |= OPP_DIRTY; | ||
513 | for (i = 0; i < count; i++, p++) | ||
514 | if (*p == '\n') { | ||
515 | *p = 0; | ||
516 | break; | ||
517 | } | 108 | } |
518 | if (i < count) { | ||
519 | op->len = p - op->value; | ||
520 | *ppos += i + 1; | ||
521 | if ((p > op->value) && (op->flag & OPP_QUOTED) | ||
522 | && (*(p - 1) == '\'')) | ||
523 | op->len--; | ||
524 | } else { | ||
525 | if (p - op->value > op->len) | ||
526 | op->len = p - op->value; | ||
527 | *ppos += count; | ||
528 | } | 109 | } |
529 | } | 110 | } |
530 | return *ppos - k; | 111 | seq_printf(f, "\n"); |
112 | |||
113 | return 0; | ||
531 | } | 114 | } |
532 | 115 | ||
533 | int property_release (struct inode *inode, struct file *filp) | 116 | static void *property_start(struct seq_file *f, loff_t *pos) |
534 | { | 117 | { |
535 | openprom_property *op = (openprom_property *)filp->private_data; | 118 | if (*pos == 0) |
536 | int error; | 119 | return pos; |
537 | u32 node; | 120 | return NULL; |
538 | 121 | } | |
539 | if (!op) | 122 | |
540 | return 0; | 123 | static void *property_next(struct seq_file *f, void *v, loff_t *pos) |
541 | lock_kernel(); | 124 | { |
542 | node = nodes[(u16)((long)inode->u.generic_ip)].node; | 125 | (*pos)++; |
543 | if ((u16)((long)inode->u.generic_ip) == aliases) { | 126 | return NULL; |
544 | if ((op->flag & OPP_DIRTY) && (op->flag & OPP_STRING)) { | 127 | } |
545 | char *p = op->name; | 128 | |
546 | int i = (op->value - op->name) - strlen (op->name) - 1; | 129 | static void property_stop(struct seq_file *f, void *v) |
547 | op->value [op->len] = 0; | 130 | { |
548 | *(op->value - 1) = ' '; | 131 | /* Nothing to do */ |
549 | if (i) { | 132 | } |
550 | for (p = op->value - i - 2; p >= op->name; p--) | 133 | |
551 | p[i] = *p; | 134 | static struct seq_operations property_op = { |
552 | p = op->name + i; | 135 | .start = property_start, |
553 | } | 136 | .next = property_next, |
554 | memcpy (p - 8, "nvalias ", 8); | 137 | .stop = property_stop, |
555 | prom_feval (p - 8); | 138 | .show = property_show |
556 | } | 139 | }; |
557 | } else if (op->flag & OPP_DIRTY) { | 140 | |
558 | if (op->flag & OPP_STRING) { | 141 | static int property_open(struct inode *inode, struct file *file) |
559 | op->value [op->len] = 0; | 142 | { |
560 | error = prom_setprop (node, op->name, | 143 | struct op_inode_info *oi = OP_I(inode); |
561 | op->value, op->len + 1); | 144 | int ret; |
562 | if (error <= 0) | 145 | |
563 | printk (KERN_WARNING "openpromfs: " | 146 | BUG_ON(oi->type != op_inode_prop); |
564 | "Couldn't write property %s\n", | 147 | |
565 | op->name); | 148 | ret = seq_open(file, &property_op); |
566 | } else if ((op->flag & OPP_BINARY) || !op->len) { | 149 | if (!ret) { |
567 | error = prom_setprop (node, op->name, | 150 | struct seq_file *m = file->private_data; |
568 | op->value, op->len); | 151 | m->private = oi->u.prop; |
569 | if (error <= 0) | ||
570 | printk (KERN_WARNING "openpromfs: " | ||
571 | "Couldn't write property %s\n", | ||
572 | op->name); | ||
573 | } else { | ||
574 | printk (KERN_WARNING "openpromfs: " | ||
575 | "Unknown property type of %s\n", | ||
576 | op->name); | ||
577 | } | ||
578 | } | 152 | } |
579 | unlock_kernel(); | 153 | return ret; |
580 | kfree (filp->private_data); | ||
581 | return 0; | ||
582 | } | 154 | } |
583 | 155 | ||
584 | static const struct file_operations openpromfs_prop_ops = { | 156 | static const struct file_operations openpromfs_prop_ops = { |
585 | .read = property_read, | 157 | .open = property_open, |
586 | .write = property_write, | 158 | .read = seq_read, |
587 | .release = property_release, | 159 | .llseek = seq_lseek, |
160 | .release = seq_release, | ||
588 | }; | 161 | }; |
589 | 162 | ||
590 | static const struct file_operations openpromfs_nodenum_ops = { | 163 | static int openpromfs_readdir(struct file *, void *, filldir_t); |
591 | .read = nodenum_read, | ||
592 | }; | ||
593 | 164 | ||
594 | static const struct file_operations openprom_operations = { | 165 | static const struct file_operations openprom_operations = { |
595 | .read = generic_read_dir, | 166 | .read = generic_read_dir, |
596 | .readdir = openpromfs_readdir, | 167 | .readdir = openpromfs_readdir, |
597 | }; | 168 | }; |
598 | 169 | ||
599 | static struct inode_operations openprom_alias_inode_operations = { | 170 | static struct dentry *openpromfs_lookup(struct inode *, struct dentry *, struct nameidata *); |
600 | .create = openpromfs_create, | ||
601 | .lookup = openpromfs_lookup, | ||
602 | .unlink = openpromfs_unlink, | ||
603 | }; | ||
604 | 171 | ||
605 | static struct inode_operations openprom_inode_operations = { | 172 | static struct inode_operations openprom_inode_operations = { |
606 | .lookup = openpromfs_lookup, | 173 | .lookup = openpromfs_lookup, |
607 | }; | 174 | }; |
608 | 175 | ||
609 | static int lookup_children(u16 n, const char * name, int len) | 176 | static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) |
610 | { | ||
611 | int ret; | ||
612 | u16 node; | ||
613 | for (; n != 0xffff; n = nodes[n].next) { | ||
614 | node = nodes[n].child; | ||
615 | if (node != 0xffff) { | ||
616 | char buffer[128]; | ||
617 | int i; | ||
618 | char *p; | ||
619 | |||
620 | while (node != 0xffff) { | ||
621 | if (prom_getname (nodes[node].node, | ||
622 | buffer, 128) >= 0) { | ||
623 | i = strlen (buffer); | ||
624 | if ((len == i) | ||
625 | && !strncmp (buffer, name, len)) | ||
626 | return NODE2INO(node); | ||
627 | p = strchr (buffer, '@'); | ||
628 | if (p && (len == p - buffer) | ||
629 | && !strncmp (buffer, name, len)) | ||
630 | return NODE2INO(node); | ||
631 | } | ||
632 | node = nodes[node].next; | ||
633 | } | ||
634 | } else | ||
635 | continue; | ||
636 | ret = lookup_children (nodes[n].child, name, len); | ||
637 | if (ret) return ret; | ||
638 | } | ||
639 | return 0; | ||
640 | } | ||
641 | |||
642 | static struct dentry *openpromfs_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd) | ||
643 | { | 177 | { |
644 | int ino = 0; | 178 | struct op_inode_info *ent_oi, *oi = OP_I(dir); |
645 | #define OPFSL_DIR 0 | 179 | struct device_node *dp, *child; |
646 | #define OPFSL_PROPERTY 1 | 180 | struct property *prop; |
647 | #define OPFSL_NODENUM 2 | 181 | enum op_inode_type ent_type; |
648 | int type = 0; | 182 | union op_inode_data ent_data; |
649 | char buffer[128]; | ||
650 | char *p; | ||
651 | const char *name; | 183 | const char *name; |
652 | u32 n; | ||
653 | u16 dirnode; | ||
654 | unsigned int len; | ||
655 | int i; | ||
656 | struct inode *inode; | 184 | struct inode *inode; |
657 | char buffer2[64]; | 185 | unsigned int ino; |
186 | int len; | ||
658 | 187 | ||
659 | inode = NULL; | 188 | BUG_ON(oi->type != op_inode_node); |
189 | |||
190 | dp = oi->u.node; | ||
191 | |||
660 | name = dentry->d_name.name; | 192 | name = dentry->d_name.name; |
661 | len = dentry->d_name.len; | 193 | len = dentry->d_name.len; |
662 | lock_kernel(); | 194 | |
663 | if (name [0] == '.' && len == 5 && !strncmp (name + 1, "node", 4)) { | 195 | mutex_lock(&op_mutex); |
664 | ino = NODEP2INO(NODE(dir->i_ino).first_prop); | 196 | |
665 | type = OPFSL_NODENUM; | 197 | child = dp->child; |
666 | } | 198 | while (child) { |
667 | if (!ino) { | 199 | int n = strlen(child->path_component_name); |
668 | u16 node = NODE(dir->i_ino).child; | 200 | |
669 | while (node != 0xffff) { | 201 | if (len == n && |
670 | if (prom_getname (nodes[node].node, buffer, 128) >= 0) { | 202 | !strncmp(child->path_component_name, name, len)) { |
671 | i = strlen (buffer); | 203 | ent_type = op_inode_node; |
672 | if (len == i && !strncmp (buffer, name, len)) { | 204 | ent_data.node = child; |
673 | ino = NODE2INO(node); | 205 | ino = child->unique_id; |
674 | type = OPFSL_DIR; | 206 | goto found; |
675 | break; | ||
676 | } | ||
677 | p = strchr (buffer, '@'); | ||
678 | if (p && (len == p - buffer) | ||
679 | && !strncmp (buffer, name, len)) { | ||
680 | ino = NODE2INO(node); | ||
681 | type = OPFSL_DIR; | ||
682 | break; | ||
683 | } | ||
684 | } | ||
685 | node = nodes[node].next; | ||
686 | } | ||
687 | } | ||
688 | n = NODE(dir->i_ino).node; | ||
689 | dirnode = dir->i_ino - OPENPROM_FIRST_INO; | ||
690 | if (!ino) { | ||
691 | int j = NODEP2INO(NODE(dir->i_ino).first_prop); | ||
692 | if (dirnode != aliases) { | ||
693 | for (p = prom_firstprop (n, buffer2); | ||
694 | p && *p; | ||
695 | p = prom_nextprop (n, p, buffer2)) { | ||
696 | j++; | ||
697 | if ((len == strlen (p)) | ||
698 | && !strncmp (p, name, len)) { | ||
699 | ino = j; | ||
700 | type = OPFSL_PROPERTY; | ||
701 | break; | ||
702 | } | ||
703 | } | ||
704 | } else { | ||
705 | int k; | ||
706 | for (k = 0; k < aliases_nodes; k++) { | ||
707 | j++; | ||
708 | if (alias_names [k] | ||
709 | && (len == strlen (alias_names [k])) | ||
710 | && !strncmp (alias_names [k], name, len)) { | ||
711 | ino = j; | ||
712 | type = OPFSL_PROPERTY; | ||
713 | break; | ||
714 | } | ||
715 | } | ||
716 | } | 207 | } |
208 | child = child->sibling; | ||
717 | } | 209 | } |
718 | if (!ino) { | 210 | |
719 | ino = lookup_children (NODE(dir->i_ino).child, name, len); | 211 | prop = dp->properties; |
720 | if (ino) | 212 | while (prop) { |
721 | type = OPFSL_DIR; | 213 | int n = strlen(prop->name); |
722 | else { | 214 | |
723 | unlock_kernel(); | 215 | if (len == n && !strncmp(prop->name, name, len)) { |
724 | return ERR_PTR(-ENOENT); | 216 | ent_type = op_inode_prop; |
217 | ent_data.prop = prop; | ||
218 | ino = prop->unique_id; | ||
219 | goto found; | ||
725 | } | 220 | } |
221 | |||
222 | prop = prop->next; | ||
726 | } | 223 | } |
727 | inode = iget (dir->i_sb, ino); | 224 | |
728 | unlock_kernel(); | 225 | mutex_unlock(&op_mutex); |
226 | return ERR_PTR(-ENOENT); | ||
227 | |||
228 | found: | ||
229 | inode = iget(dir->i_sb, ino); | ||
230 | mutex_unlock(&op_mutex); | ||
729 | if (!inode) | 231 | if (!inode) |
730 | return ERR_PTR(-EINVAL); | 232 | return ERR_PTR(-EINVAL); |
731 | switch (type) { | 233 | ent_oi = OP_I(inode); |
732 | case OPFSL_DIR: | 234 | ent_oi->type = ent_type; |
235 | ent_oi->u = ent_data; | ||
236 | |||
237 | switch (ent_type) { | ||
238 | case op_inode_node: | ||
733 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; | 239 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; |
734 | if (ino == OPENPROM_FIRST_INO + aliases) { | 240 | inode->i_op = &openprom_inode_operations; |
735 | inode->i_mode |= S_IWUSR; | ||
736 | inode->i_op = &openprom_alias_inode_operations; | ||
737 | } else | ||
738 | inode->i_op = &openprom_inode_operations; | ||
739 | inode->i_fop = &openprom_operations; | 241 | inode->i_fop = &openprom_operations; |
740 | inode->i_nlink = 2; | 242 | inode->i_nlink = 2; |
741 | break; | 243 | break; |
742 | case OPFSL_NODENUM: | 244 | case op_inode_prop: |
743 | inode->i_mode = S_IFREG | S_IRUGO; | 245 | if (!strcmp(dp->name, "options") && (len == 17) && |
744 | inode->i_fop = &openpromfs_nodenum_ops; | 246 | !strncmp (name, "security-password", 17)) |
745 | inode->i_nlink = 1; | ||
746 | inode->u.generic_ip = (void *)(long)(n); | ||
747 | break; | ||
748 | case OPFSL_PROPERTY: | ||
749 | if ((dirnode == options) && (len == 17) | ||
750 | && !strncmp (name, "security-password", 17)) | ||
751 | inode->i_mode = S_IFREG | S_IRUSR | S_IWUSR; | 247 | inode->i_mode = S_IFREG | S_IRUSR | S_IWUSR; |
752 | else { | 248 | else |
753 | inode->i_mode = S_IFREG | S_IRUGO; | 249 | inode->i_mode = S_IFREG | S_IRUGO; |
754 | if (dirnode == options || dirnode == aliases) { | ||
755 | if (len != 4 || strncmp (name, "name", 4)) | ||
756 | inode->i_mode |= S_IWUSR; | ||
757 | } | ||
758 | } | ||
759 | inode->i_fop = &openpromfs_prop_ops; | 250 | inode->i_fop = &openpromfs_prop_ops; |
760 | inode->i_nlink = 1; | 251 | inode->i_nlink = 1; |
761 | if (inode->i_size < 0) | 252 | inode->i_size = ent_oi->u.prop->length; |
762 | inode->i_size = 0; | ||
763 | inode->u.generic_ip = (void *)(long)(((u16)dirnode) | | ||
764 | (((u16)(ino - NODEP2INO(NODE(dir->i_ino).first_prop) - 1)) << 16)); | ||
765 | break; | 253 | break; |
766 | } | 254 | } |
767 | 255 | ||
@@ -775,237 +263,89 @@ static struct dentry *openpromfs_lookup(struct inode * dir, struct dentry *dentr | |||
775 | static int openpromfs_readdir(struct file * filp, void * dirent, filldir_t filldir) | 263 | static int openpromfs_readdir(struct file * filp, void * dirent, filldir_t filldir) |
776 | { | 264 | { |
777 | struct inode *inode = filp->f_dentry->d_inode; | 265 | struct inode *inode = filp->f_dentry->d_inode; |
266 | struct op_inode_info *oi = OP_I(inode); | ||
267 | struct device_node *dp = oi->u.node; | ||
268 | struct device_node *child; | ||
269 | struct property *prop; | ||
778 | unsigned int ino; | 270 | unsigned int ino; |
779 | u32 n; | 271 | int i; |
780 | int i, j; | 272 | |
781 | char buffer[128]; | 273 | mutex_lock(&op_mutex); |
782 | u16 node; | ||
783 | char *p; | ||
784 | char buffer2[64]; | ||
785 | |||
786 | lock_kernel(); | ||
787 | 274 | ||
788 | ino = inode->i_ino; | 275 | ino = inode->i_ino; |
789 | i = filp->f_pos; | 276 | i = filp->f_pos; |
790 | switch (i) { | 277 | switch (i) { |
791 | case 0: | 278 | case 0: |
792 | if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0) goto out; | 279 | if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0) |
280 | goto out; | ||
793 | i++; | 281 | i++; |
794 | filp->f_pos++; | 282 | filp->f_pos++; |
795 | /* fall thru */ | 283 | /* fall thru */ |
796 | case 1: | 284 | case 1: |
797 | if (filldir(dirent, "..", 2, i, | 285 | if (filldir(dirent, "..", 2, i, |
798 | (NODE(ino).parent == 0xffff) ? | 286 | (dp->parent == NULL ? |
799 | OPENPROM_ROOT_INO : NODE2INO(NODE(ino).parent), DT_DIR) < 0) | 287 | OPENPROM_ROOT_INO : |
288 | dp->parent->unique_id), DT_DIR) < 0) | ||
800 | goto out; | 289 | goto out; |
801 | i++; | 290 | i++; |
802 | filp->f_pos++; | 291 | filp->f_pos++; |
803 | /* fall thru */ | 292 | /* fall thru */ |
804 | default: | 293 | default: |
805 | i -= 2; | 294 | i -= 2; |
806 | node = NODE(ino).child; | 295 | |
807 | while (i && node != 0xffff) { | 296 | /* First, the children nodes as directories. */ |
808 | node = nodes[node].next; | 297 | child = dp->child; |
298 | while (i && child) { | ||
299 | child = child->sibling; | ||
809 | i--; | 300 | i--; |
810 | } | 301 | } |
811 | while (node != 0xffff) { | 302 | while (child) { |
812 | if (prom_getname (nodes[node].node, buffer, 128) < 0) | 303 | if (filldir(dirent, |
813 | goto out; | 304 | child->path_component_name, |
814 | if (filldir(dirent, buffer, strlen(buffer), | 305 | strlen(child->path_component_name), |
815 | filp->f_pos, NODE2INO(node), DT_DIR) < 0) | 306 | filp->f_pos, child->unique_id, DT_DIR) < 0) |
816 | goto out; | 307 | goto out; |
308 | |||
817 | filp->f_pos++; | 309 | filp->f_pos++; |
818 | node = nodes[node].next; | 310 | child = child->sibling; |
819 | } | 311 | } |
820 | j = NODEP2INO(NODE(ino).first_prop); | 312 | |
821 | if (!i) { | 313 | /* Next, the properties as files. */ |
822 | if (filldir(dirent, ".node", 5, filp->f_pos, j, DT_REG) < 0) | 314 | prop = dp->properties; |
315 | while (i && prop) { | ||
316 | prop = prop->next; | ||
317 | i--; | ||
318 | } | ||
319 | while (prop) { | ||
320 | if (filldir(dirent, prop->name, strlen(prop->name), | ||
321 | filp->f_pos, prop->unique_id, DT_REG) < 0) | ||
823 | goto out; | 322 | goto out; |
323 | |||
824 | filp->f_pos++; | 324 | filp->f_pos++; |
825 | } else | 325 | prop = prop->next; |
826 | i--; | ||
827 | n = NODE(ino).node; | ||
828 | if (ino == OPENPROM_FIRST_INO + aliases) { | ||
829 | for (j++; i < aliases_nodes; i++, j++) { | ||
830 | if (alias_names [i]) { | ||
831 | if (filldir (dirent, alias_names [i], | ||
832 | strlen (alias_names [i]), | ||
833 | filp->f_pos, j, DT_REG) < 0) goto out; | ||
834 | filp->f_pos++; | ||
835 | } | ||
836 | } | ||
837 | } else { | ||
838 | for (p = prom_firstprop (n, buffer2); | ||
839 | p && *p; | ||
840 | p = prom_nextprop (n, p, buffer2)) { | ||
841 | j++; | ||
842 | if (i) i--; | ||
843 | else { | ||
844 | if (filldir(dirent, p, strlen(p), | ||
845 | filp->f_pos, j, DT_REG) < 0) | ||
846 | goto out; | ||
847 | filp->f_pos++; | ||
848 | } | ||
849 | } | ||
850 | } | 326 | } |
851 | } | 327 | } |
852 | out: | 328 | out: |
853 | unlock_kernel(); | 329 | mutex_unlock(&op_mutex); |
854 | return 0; | ||
855 | } | ||
856 | |||
857 | static int openpromfs_create (struct inode *dir, struct dentry *dentry, int mode, | ||
858 | struct nameidata *nd) | ||
859 | { | ||
860 | char *p; | ||
861 | struct inode *inode; | ||
862 | |||
863 | if (!dir) | ||
864 | return -ENOENT; | ||
865 | if (dentry->d_name.len > 256) | ||
866 | return -EINVAL; | ||
867 | p = kmalloc (dentry->d_name.len + 1, GFP_KERNEL); | ||
868 | if (!p) | ||
869 | return -ENOMEM; | ||
870 | strncpy (p, dentry->d_name.name, dentry->d_name.len); | ||
871 | p [dentry->d_name.len] = 0; | ||
872 | lock_kernel(); | ||
873 | if (aliases_nodes == ALIASES_NNODES) { | ||
874 | kfree(p); | ||
875 | unlock_kernel(); | ||
876 | return -EIO; | ||
877 | } | ||
878 | alias_names [aliases_nodes++] = p; | ||
879 | inode = iget (dir->i_sb, | ||
880 | NODEP2INO(NODE(dir->i_ino).first_prop) + aliases_nodes); | ||
881 | if (!inode) { | ||
882 | unlock_kernel(); | ||
883 | return -EINVAL; | ||
884 | } | ||
885 | inode->i_mode = S_IFREG | S_IRUGO | S_IWUSR; | ||
886 | inode->i_fop = &openpromfs_prop_ops; | ||
887 | inode->i_nlink = 1; | ||
888 | if (inode->i_size < 0) inode->i_size = 0; | ||
889 | inode->u.generic_ip = (void *)(long)(((u16)aliases) | | ||
890 | (((u16)(aliases_nodes - 1)) << 16)); | ||
891 | unlock_kernel(); | ||
892 | d_instantiate(dentry, inode); | ||
893 | return 0; | 330 | return 0; |
894 | } | 331 | } |
895 | 332 | ||
896 | static int openpromfs_unlink (struct inode *dir, struct dentry *dentry) | 333 | static kmem_cache_t *op_inode_cachep; |
897 | { | ||
898 | unsigned int len; | ||
899 | char *p; | ||
900 | const char *name; | ||
901 | int i; | ||
902 | |||
903 | name = dentry->d_name.name; | ||
904 | len = dentry->d_name.len; | ||
905 | lock_kernel(); | ||
906 | for (i = 0; i < aliases_nodes; i++) | ||
907 | if ((strlen (alias_names [i]) == len) | ||
908 | && !strncmp (name, alias_names[i], len)) { | ||
909 | char buffer[512]; | ||
910 | |||
911 | p = alias_names [i]; | ||
912 | alias_names [i] = NULL; | ||
913 | kfree (p); | ||
914 | strcpy (buffer, "nvunalias "); | ||
915 | memcpy (buffer + 10, name, len); | ||
916 | buffer [10 + len] = 0; | ||
917 | prom_feval (buffer); | ||
918 | } | ||
919 | unlock_kernel(); | ||
920 | return 0; | ||
921 | } | ||
922 | 334 | ||
923 | /* {{{ init section */ | 335 | static struct inode *openprom_alloc_inode(struct super_block *sb) |
924 | static int __init check_space (u16 n) | ||
925 | { | 336 | { |
926 | unsigned long pages; | 337 | struct op_inode_info *oi; |
927 | 338 | ||
928 | if ((1 << alloced) * PAGE_SIZE < (n + 2) * sizeof(openpromfs_node)) { | 339 | oi = kmem_cache_alloc(op_inode_cachep, SLAB_KERNEL); |
929 | pages = __get_free_pages (GFP_KERNEL, alloced + 1); | 340 | if (!oi) |
930 | if (!pages) | 341 | return NULL; |
931 | return -1; | ||
932 | 342 | ||
933 | if (nodes) { | 343 | return &oi->vfs_inode; |
934 | memcpy ((char *)pages, (char *)nodes, | ||
935 | (1 << alloced) * PAGE_SIZE); | ||
936 | free_pages ((unsigned long)nodes, alloced); | ||
937 | } | ||
938 | alloced++; | ||
939 | nodes = (openpromfs_node *)pages; | ||
940 | } | ||
941 | return 0; | ||
942 | } | 344 | } |
943 | 345 | ||
944 | static u16 __init get_nodes (u16 parent, u32 node) | 346 | static void openprom_destroy_inode(struct inode *inode) |
945 | { | 347 | { |
946 | char *p; | 348 | kmem_cache_free(op_inode_cachep, OP_I(inode)); |
947 | u16 n = last_node++, i; | ||
948 | char buffer[64]; | ||
949 | |||
950 | if (check_space (n) < 0) | ||
951 | return 0xffff; | ||
952 | nodes[n].parent = parent; | ||
953 | nodes[n].node = node; | ||
954 | nodes[n].next = 0xffff; | ||
955 | nodes[n].child = 0xffff; | ||
956 | nodes[n].first_prop = first_prop++; | ||
957 | if (!parent) { | ||
958 | char buffer[8]; | ||
959 | int j; | ||
960 | |||
961 | if ((j = prom_getproperty (node, "name", buffer, 8)) >= 0) { | ||
962 | buffer[j] = 0; | ||
963 | if (!strcmp (buffer, "options")) | ||
964 | options = n; | ||
965 | else if (!strcmp (buffer, "aliases")) | ||
966 | aliases = n; | ||
967 | } | ||
968 | } | ||
969 | if (n != aliases) | ||
970 | for (p = prom_firstprop (node, buffer); | ||
971 | p && p != (char *)-1 && *p; | ||
972 | p = prom_nextprop (node, p, buffer)) | ||
973 | first_prop++; | ||
974 | else { | ||
975 | char *q; | ||
976 | for (p = prom_firstprop (node, buffer); | ||
977 | p && p != (char *)-1 && *p; | ||
978 | p = prom_nextprop (node, p, buffer)) { | ||
979 | if (aliases_nodes == ALIASES_NNODES) | ||
980 | break; | ||
981 | for (i = 0; i < aliases_nodes; i++) | ||
982 | if (!strcmp (p, alias_names [i])) | ||
983 | break; | ||
984 | if (i < aliases_nodes) | ||
985 | continue; | ||
986 | q = kmalloc (strlen (p) + 1, GFP_KERNEL); | ||
987 | if (!q) | ||
988 | return 0xffff; | ||
989 | strcpy (q, p); | ||
990 | alias_names [aliases_nodes++] = q; | ||
991 | } | ||
992 | first_prop += ALIASES_NNODES; | ||
993 | } | ||
994 | node = prom_getchild (node); | ||
995 | if (node) { | ||
996 | parent = get_nodes (n, node); | ||
997 | if (parent == 0xffff) | ||
998 | return 0xffff; | ||
999 | nodes[n].child = parent; | ||
1000 | while ((node = prom_getsibling (node)) != 0) { | ||
1001 | i = get_nodes (n, node); | ||
1002 | if (i == 0xffff) | ||
1003 | return 0xffff; | ||
1004 | nodes[parent].next = i; | ||
1005 | parent = i; | ||
1006 | } | ||
1007 | } | ||
1008 | return n; | ||
1009 | } | 349 | } |
1010 | 350 | ||
1011 | static void openprom_read_inode(struct inode * inode) | 351 | static void openprom_read_inode(struct inode * inode) |
@@ -1025,6 +365,8 @@ static int openprom_remount(struct super_block *sb, int *flags, char *data) | |||
1025 | } | 365 | } |
1026 | 366 | ||
1027 | static struct super_operations openprom_sops = { | 367 | static struct super_operations openprom_sops = { |
368 | .alloc_inode = openprom_alloc_inode, | ||
369 | .destroy_inode = openprom_destroy_inode, | ||
1028 | .read_inode = openprom_read_inode, | 370 | .read_inode = openprom_read_inode, |
1029 | .statfs = simple_statfs, | 371 | .statfs = simple_statfs, |
1030 | .remount_fs = openprom_remount, | 372 | .remount_fs = openprom_remount, |
@@ -1032,7 +374,8 @@ static struct super_operations openprom_sops = { | |||
1032 | 374 | ||
1033 | static int openprom_fill_super(struct super_block *s, void *data, int silent) | 375 | static int openprom_fill_super(struct super_block *s, void *data, int silent) |
1034 | { | 376 | { |
1035 | struct inode * root_inode; | 377 | struct inode *root_inode; |
378 | struct op_inode_info *oi; | ||
1036 | 379 | ||
1037 | s->s_flags |= MS_NOATIME; | 380 | s->s_flags |= MS_NOATIME; |
1038 | s->s_blocksize = 1024; | 381 | s->s_blocksize = 1024; |
@@ -1043,6 +386,11 @@ static int openprom_fill_super(struct super_block *s, void *data, int silent) | |||
1043 | root_inode = iget(s, OPENPROM_ROOT_INO); | 386 | root_inode = iget(s, OPENPROM_ROOT_INO); |
1044 | if (!root_inode) | 387 | if (!root_inode) |
1045 | goto out_no_root; | 388 | goto out_no_root; |
389 | |||
390 | oi = OP_I(root_inode); | ||
391 | oi->type = op_inode_node; | ||
392 | oi->u.node = of_find_node_by_path("/"); | ||
393 | |||
1046 | s->s_root = d_alloc_root(root_inode); | 394 | s->s_root = d_alloc_root(root_inode); |
1047 | if (!s->s_root) | 395 | if (!s->s_root) |
1048 | goto out_no_root; | 396 | goto out_no_root; |
@@ -1054,10 +402,10 @@ out_no_root: | |||
1054 | return -ENOMEM; | 402 | return -ENOMEM; |
1055 | } | 403 | } |
1056 | 404 | ||
1057 | static struct super_block *openprom_get_sb(struct file_system_type *fs_type, | 405 | static int openprom_get_sb(struct file_system_type *fs_type, |
1058 | int flags, const char *dev_name, void *data) | 406 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
1059 | { | 407 | { |
1060 | return get_sb_single(fs_type, flags, data, openprom_fill_super); | 408 | return get_sb_single(fs_type, flags, data, openprom_fill_super, mnt); |
1061 | } | 409 | } |
1062 | 410 | ||
1063 | static struct file_system_type openprom_fs_type = { | 411 | static struct file_system_type openprom_fs_type = { |
@@ -1067,29 +415,39 @@ static struct file_system_type openprom_fs_type = { | |||
1067 | .kill_sb = kill_anon_super, | 415 | .kill_sb = kill_anon_super, |
1068 | }; | 416 | }; |
1069 | 417 | ||
418 | static void op_inode_init_once(void *data, kmem_cache_t * cachep, unsigned long flags) | ||
419 | { | ||
420 | struct op_inode_info *oi = (struct op_inode_info *) data; | ||
421 | |||
422 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | ||
423 | SLAB_CTOR_CONSTRUCTOR) | ||
424 | inode_init_once(&oi->vfs_inode); | ||
425 | } | ||
426 | |||
1070 | static int __init init_openprom_fs(void) | 427 | static int __init init_openprom_fs(void) |
1071 | { | 428 | { |
1072 | nodes = (openpromfs_node *)__get_free_pages(GFP_KERNEL, 0); | 429 | int err; |
1073 | if (!nodes) { | 430 | |
1074 | printk (KERN_WARNING "openpromfs: can't get free page\n"); | 431 | op_inode_cachep = kmem_cache_create("op_inode_cache", |
1075 | return -EIO; | 432 | sizeof(struct op_inode_info), |
1076 | } | 433 | 0, |
1077 | if (get_nodes (0xffff, prom_root_node) == 0xffff) { | 434 | (SLAB_RECLAIM_ACCOUNT | |
1078 | printk (KERN_WARNING "openpromfs: couldn't setup tree\n"); | 435 | SLAB_MEM_SPREAD), |
1079 | return -EIO; | 436 | op_inode_init_once, NULL); |
1080 | } | 437 | if (!op_inode_cachep) |
1081 | nodes[last_node].first_prop = first_prop; | 438 | return -ENOMEM; |
1082 | return register_filesystem(&openprom_fs_type); | 439 | |
440 | err = register_filesystem(&openprom_fs_type); | ||
441 | if (err) | ||
442 | kmem_cache_destroy(op_inode_cachep); | ||
443 | |||
444 | return err; | ||
1083 | } | 445 | } |
1084 | 446 | ||
1085 | static void __exit exit_openprom_fs(void) | 447 | static void __exit exit_openprom_fs(void) |
1086 | { | 448 | { |
1087 | int i; | ||
1088 | unregister_filesystem(&openprom_fs_type); | 449 | unregister_filesystem(&openprom_fs_type); |
1089 | free_pages ((unsigned long)nodes, alloced); | 450 | kmem_cache_destroy(op_inode_cachep); |
1090 | for (i = 0; i < aliases_nodes; i++) | ||
1091 | kfree (alias_names [i]); | ||
1092 | nodes = NULL; | ||
1093 | } | 451 | } |
1094 | 452 | ||
1095 | module_init(init_openprom_fs) | 453 | module_init(init_openprom_fs) |