The patch titled
s390: dasd ioctl never returns
has been removed from the -mm tree. Its filename is
s390-dasd-ioctl-never-returns.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Horst Hummel <horst.hummel@xxxxxxxxxx>
The dasd state machine is not designed to enable an unformatted device, since
'unformatted' is a final state. The BIODASDENABLE ioctl calls
dasd_enable_device() which never returns if the device is in this special
state. Return -EPERM in dasd_increase_state for unformatted devices to make
dasd_enable_device terminate. Note: To get such an unformatted device online
it has to be re-analyzed. This means that the device needs to be disabled
prior to re-enablement.
Signed-off-by: Horst Hummel <horst.hummel@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/block/dasd.c | 5 +++++
1 files changed, 5 insertions(+)
diff -puN drivers/s390/block/dasd.c~s390-dasd-ioctl-never-returns drivers/s390/block/dasd.c
--- devel/drivers/s390/block/dasd.c~s390-dasd-ioctl-never-returns 2006-04-27 18:39:05.000000000 -0700
+++ devel-akpm/drivers/s390/block/dasd.c 2006-04-27 18:39:05.000000000 -0700
@@ -315,6 +315,11 @@ dasd_increase_state(struct dasd_device *
rc = dasd_state_basic_to_ready(device);
if (!rc &&
+ device->state == DASD_STATE_UNFMT &&
+ device->target > DASD_STATE_UNFMT)
+ rc = -EPERM;
+
+ if (!rc &&
device->state == DASD_STATE_READY &&
device->target >= DASD_STATE_ONLINE)
rc = dasd_state_ready_to_online(device);
_
Patches currently in -mm which might be from horst.hummel@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
