2008-02-19 14:46:32

by Martin Schwidefsky

[permalink] [raw]
Subject: [patch 02/13] cio: Do timed recovery on workqueue.

From: Cornelia Huck <[email protected]>

We can't do our recovery in softirq context, so we schedule it from
our timer function.

Signed-off-by: Cornelia Huck <[email protected]>
Signed-off-by: Martin Schwidefsky <[email protected]>
---

drivers/s390/cio/device.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

Index: quilt-2.6/drivers/s390/cio/device.c
===================================================================
--- quilt-2.6.orig/drivers/s390/cio/device.c
+++ quilt-2.6/drivers/s390/cio/device.c
@@ -1535,7 +1535,7 @@ static int recovery_check(struct device
return 0;
}

-static void recovery_func(unsigned long data)
+static void recovery_work_func(struct work_struct *unused)
{
int redo = 0;

@@ -1553,6 +1553,17 @@ static void recovery_func(unsigned long
CIO_MSG_EVENT(2, "recovery: end\n");
}

+static DECLARE_WORK(recovery_work, recovery_work_func);
+
+static void recovery_func(unsigned long data)
+{
+ /*
+ * We can't do our recovery in softirq context and it's not
+ * performance critical, so we schedule it.
+ */
+ schedule_work(&recovery_work);
+}
+
void ccw_device_schedule_recovery(void)
{
unsigned long flags;

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.