From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Ursula Braun <ursula.braun@de.ibm.com>,
linux390@de.ibm.com, linux-s390@vger.kernel.org
Subject: [PATCH 08/12] iucv: convert cpu notifier to return encapsulate errno value
Date: Thu, 18 Mar 2010 18:05:20 +0900 [thread overview]
Message-ID: <1268903124-10237-8-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1268903124-10237-1-git-send-email-akinobu.mita@gmail.com>
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>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
---
net/iucv/iucv.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index fd8b283..f28ad2c 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -632,13 +632,14 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
iucv_irq_data[cpu] = kmalloc_node(sizeof(struct iucv_irq_data),
GFP_KERNEL|GFP_DMA, cpu_to_node(cpu));
if (!iucv_irq_data[cpu])
- return NOTIFY_BAD;
+ return notifier_from_errno(-ENOMEM);
+
iucv_param[cpu] = kmalloc_node(sizeof(union iucv_param),
GFP_KERNEL|GFP_DMA, cpu_to_node(cpu));
if (!iucv_param[cpu]) {
kfree(iucv_irq_data[cpu]);
iucv_irq_data[cpu] = NULL;
- return NOTIFY_BAD;
+ return notifier_from_errno(-ENOMEM);
}
iucv_param_irq[cpu] = kmalloc_node(sizeof(union iucv_param),
GFP_KERNEL|GFP_DMA, cpu_to_node(cpu));
@@ -647,7 +648,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
iucv_param[cpu] = NULL;
kfree(iucv_irq_data[cpu]);
iucv_irq_data[cpu] = NULL;
- return NOTIFY_BAD;
+ return notifier_from_errno(-ENOMEM);
}
break;
case CPU_UP_CANCELED:
@@ -677,7 +678,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
cpu_clear(cpu, cpumask);
if (cpus_empty(cpumask))
/* Can't offline last IUCV enabled cpu. */
- return NOTIFY_BAD;
+ return notifier_from_errno(-EINVAL);
smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 1);
if (cpus_empty(iucv_irq_cpumask))
smp_call_function_single(first_cpu(iucv_buffer_cpumask),
--
1.6.0.6
next prev parent reply other threads:[~2010-03-18 9:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-18 9:05 [PATCH 01/12] cpu-hotplug: introduce cpu_notify(), __cpu_notify(), cpu_notify_nofail() Akinobu Mita
2010-03-18 9:05 ` [PATCH 02/12] cpu-hotplug: return better errno on cpu hotplug failure Akinobu Mita
2010-03-18 9:05 ` [PATCH 03/12] notifier: change notifier_from_errno(0) to return NOTIFY_OK Akinobu Mita
2010-03-18 9:05 ` [PATCH 04/12] x86: convert cpu notifier to return encapsulate errno value Akinobu Mita
2010-03-18 9:05 ` [PATCH 05/12] topology: " Akinobu Mita
2010-03-18 9:05 ` [PATCH 06/12] kernel/: " Akinobu Mita
2010-03-18 9:05 ` [PATCH 07/12] slab: " Akinobu Mita
2010-03-18 17:21 ` Pekka Enberg
2010-03-18 9:05 ` Akinobu Mita [this message]
2010-03-18 9:05 ` [PATCH 09/12] ehca: " Akinobu Mita
2010-03-29 8:47 ` Alexander Schmidt
2010-03-18 9:05 ` [PATCH 10/12] s390: " Akinobu Mita
2010-03-18 9:05 ` [PATCH 11/12] md: " Akinobu Mita
2010-03-18 9:05 ` [PATCH 12/12] add CPU notifier error injection module Akinobu Mita
2010-03-22 21:48 ` Andrew Morton
2010-03-23 13:00 ` Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268903124-10237-8-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux390@de.ibm.com \
--cc=ursula.braun@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox