[patch 39/52] [PATCH] cio: allow setting not-operational devices offline

Martin Schwidefsky
2009-11-13T15:11:49Z

[-- Attachment #1: 138-cio-allow-offline.diff --]
[-- Type: text/plain, Size: 1287 bytes --]

From: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>

Accept a request for setting a not-operational device offline.
This way, users can remove devices from Linux which would otherwise
remain unusable until reboot.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

drivers/s390/cio/device.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

Index: quilt-2.6/drivers/s390/cio/device.c
===================================================================
--- quilt-2.6.orig/drivers/s390/cio/device.c 2009-11-13 16:08:20.000000000 +0100
+++ quilt-2.6/drivers/s390/cio/device.c 2009-11-13 16:08:20.000000000 +0100
@@ -529,11 +529,10 @@
int force, ret;
unsigned long i;

- if ((cdev->private->state != DEV_STATE_OFFLINE &&
- cdev->private->state != DEV_STATE_ONLINE &&
- cdev->private->state != DEV_STATE_BOXED &&
- cdev->private->state != DEV_STATE_DISCONNECTED) ||
- atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
+ if (!dev_fsm_final_state(cdev) &&
+ cdev->private->state != DEV_STATE_DISCONNECTED)
+ return -EAGAIN;
+ if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
return -EAGAIN;

if (cdev->drv && !try_module_get(cdev->drv->owner)) {