[S390] cio: make wait_events interruptible
Make the potentially long blocking wait_event's used by the cio
settle mechanism interruptible.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 366affc..169a277 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -1016,19 +1016,22 @@
struct css_driver *cssdrv = to_cssdriver(drv);
if (cssdrv->settle)
- cssdrv->settle();
+ return cssdrv->settle();
return 0;
}
-static inline void css_complete_work(void)
+static inline int css_complete_work(void)
{
int ret;
/* Wait for the evaluation of subchannels to finish. */
- wait_event(css_eval_wq, atomic_read(&css_eval_scheduled) == 0);
+ ret = wait_event_interruptible(css_eval_wq,
+ atomic_read(&css_eval_scheduled) == 0);
+ if (ret)
+ return -EINTR;
flush_workqueue(cio_work_q);
/* Wait for the subchannel type specific initialization to finish */
- ret = bus_for_each_drv(&css_bus_type, NULL, NULL, css_settle);
+ return bus_for_each_drv(&css_bus_type, NULL, NULL, css_settle);
}
@@ -1049,10 +1052,13 @@
static ssize_t cio_settle_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
+ int ret;
+
/* Handle pending CRW's. */
crw_wait_for_channel_report();
- css_complete_work();
- return count;
+ ret = css_complete_work();
+
+ return ret ? ret : count;
}
static const struct file_operations cio_settle_proc_fops = {