diff options
| author |   Stefan Haberland <stefan.haberland@de.ibm.com> | 2011-01-31 11:30:03 +0100 |
|---|---|---|
| committer |   Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-31 11:30:20 +0100 |
| commit | f602f6d694a99a0141c066c8f0b360a0b3c16915 (patch) | |
| tree | cde04e5bf11edeeb54e32153a90ec024a76c921a /drivers/s390/block | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 (diff) | |
| download | linux-dev-f602f6d694a99a0141c066c8f0b360a0b3c16915.tar.xz linux-dev-f602f6d694a99a0141c066c8f0b360a0b3c16915.zip | |
[S390] dasd: prevent panic with unresumed devices
If a device is not resumed correctly the system crashes when this
device is set offline. This may happen if it gets disconnected
during suspend.
Check if the device is already removed from alias handling and skip
these steps to prevent the kernel panic.
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/dasd_alias.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c index 4155805dcdff..2b771f18d1ad 100644 --- a/drivers/s390/block/dasd_alias.c +++ b/drivers/s390/block/dasd_alias.c @@ -319,6 +319,9 @@ void dasd_alias_disconnect_device_from_lcu(struct dasd_device *device) private = (struct dasd_eckd_private *) device->private; lcu = private->lcu; + /* nothing to do if already disconnected */ + if (!lcu) + return; device->discipline->get_uid(device, &uid); spin_lock_irqsave(&lcu->lock, flags); list_del_init(&device->alias_list); @@ -680,6 +683,9 @@ int dasd_alias_remove_device(struct dasd_device *device) private = (struct dasd_eckd_private *) device->private; lcu = private->lcu; + /* nothing to do if already removed */ + if (!lcu) + return 0; spin_lock_irqsave(&lcu->lock, flags); _remove_device_from_lcu(lcu, device); spin_unlock_irqrestore(&lcu->lock, flags); |