diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2006-10-04 05:17:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:30 -0400 |
commit | e6a92013ba458804161c0c5b6d134d82204dc233 (patch) | |
tree | ecee5fdcef80d1dba0ac6ea87370931ea39ffecd /kernel/srcu.c | |
parent | eabc069401bcf45bcc3f19e643017bf761780aa8 (diff) |
[PATCH] SRCU: report out-of-memory errors
Currently the init_srcu_struct() routine has no way to report out-of-memory
errors. This patch (as761) makes it return -ENOMEM when the per-cpu data
allocation fails.
The patch also makes srcu_init_notifier_head() report a BUG if a notifier
head can't be initialized. Perhaps it should return -ENOMEM instead, but
in the most likely cases where this might occur I don't think any recovery
is possible. Notifier chains generally are not created dynamically.
[akpm@osdl.org: avoid statement-with-side-effect in macro]
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/srcu.c')
-rw-r--r-- | kernel/srcu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/srcu.c b/kernel/srcu.c index 7e1979f624ba..3507cabe963b 100644 --- a/kernel/srcu.c +++ b/kernel/srcu.c | |||
@@ -42,11 +42,12 @@ | |||
42 | * to any other function. Each srcu_struct represents a separate domain | 42 | * to any other function. Each srcu_struct represents a separate domain |
43 | * of SRCU protection. | 43 | * of SRCU protection. |
44 | */ | 44 | */ |
45 | void init_srcu_struct(struct srcu_struct *sp) | 45 | int init_srcu_struct(struct srcu_struct *sp) |
46 | { | 46 | { |
47 | sp->completed = 0; | 47 | sp->completed = 0; |
48 | sp->per_cpu_ref = alloc_percpu(struct srcu_struct_array); | ||
49 | mutex_init(&sp->mutex); | 48 | mutex_init(&sp->mutex); |
49 | sp->per_cpu_ref = alloc_percpu(struct srcu_struct_array); | ||
50 | return (sp->per_cpu_ref ? 0 : -ENOMEM); | ||
50 | } | 51 | } |
51 | 52 | ||
52 | /* | 53 | /* |