Commit 92e99a98bb44ccce6c902ea077b49cafcfb80025
Committed by
Linus Torvalds
1 parent
eac4068013
Exists in
master
and in
39 other branches
iucv: convert cpu notifier to return encapsulate errno value
By the previous modification, the cpu notifier can return encapsulate errno value. This converts the cpu notifiers for iucv. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff
net/iucv/iucv.c
... | ... | @@ -632,13 +632,14 @@ |
632 | 632 | iucv_irq_data[cpu] = kmalloc_node(sizeof(struct iucv_irq_data), |
633 | 633 | GFP_KERNEL|GFP_DMA, cpu_to_node(cpu)); |
634 | 634 | if (!iucv_irq_data[cpu]) |
635 | - return NOTIFY_BAD; | |
635 | + return notifier_from_errno(-ENOMEM); | |
636 | + | |
636 | 637 | iucv_param[cpu] = kmalloc_node(sizeof(union iucv_param), |
637 | 638 | GFP_KERNEL|GFP_DMA, cpu_to_node(cpu)); |
638 | 639 | if (!iucv_param[cpu]) { |
639 | 640 | kfree(iucv_irq_data[cpu]); |
640 | 641 | iucv_irq_data[cpu] = NULL; |
641 | - return NOTIFY_BAD; | |
642 | + return notifier_from_errno(-ENOMEM); | |
642 | 643 | } |
643 | 644 | iucv_param_irq[cpu] = kmalloc_node(sizeof(union iucv_param), |
644 | 645 | GFP_KERNEL|GFP_DMA, cpu_to_node(cpu)); |
... | ... | @@ -647,7 +648,7 @@ |
647 | 648 | iucv_param[cpu] = NULL; |
648 | 649 | kfree(iucv_irq_data[cpu]); |
649 | 650 | iucv_irq_data[cpu] = NULL; |
650 | - return NOTIFY_BAD; | |
651 | + return notifier_from_errno(-ENOMEM); | |
651 | 652 | } |
652 | 653 | break; |
653 | 654 | case CPU_UP_CANCELED: |
... | ... | @@ -677,7 +678,7 @@ |
677 | 678 | cpu_clear(cpu, cpumask); |
678 | 679 | if (cpus_empty(cpumask)) |
679 | 680 | /* Can't offline last IUCV enabled cpu. */ |
680 | - return NOTIFY_BAD; | |
681 | + return notifier_from_errno(-EINVAL); | |
681 | 682 | smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 1); |
682 | 683 | if (cpus_empty(iucv_irq_cpumask)) |
683 | 684 | smp_call_function_single(first_cpu(iucv_buffer_cpumask), |