leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] cio: fix init_count in case of recognition after steal lock

Browse Source 
After we try to steal a lock on a ccw device in boxed state,
we have to restart device recognition and potentially reprobing.

In this case ccw_device_init_count was erroneously decreased
twice. This patch fixes the issue.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2010-03-08 12:25:17 +01:00 committed by Martin Schwidefsky
parent 52898025cf
commit a290156f47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/s390/cio/device.c
View File

@ -764,7 +764,7 @@ static void sch_create_and_recog_new_device(struct subchannel *sch)
static void io_subchannel_register(struct ccw_device *cdev) static void io_subchannel_register(struct ccw_device *cdev)
{ {
struct subchannel *sch; struct subchannel *sch;
int ret; int ret, adjust_init_count = 1;
unsigned long flags; unsigned long flags;
sch = to_subchannel(cdev->dev.parent); sch = to_subchannel(cdev->dev.parent);
@ -793,6 +793,7 @@ static void io_subchannel_register(struct ccw_device *cdev)
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
} }
adjust_init_count = 0;
goto out; goto out;
} }
/* /*
@ -818,7 +819,7 @@ out:
cdev->private->flags.recog_done = 1; cdev->private->flags.recog_done = 1;
wake_up(&cdev->private->wait_q); wake_up(&cdev->private->wait_q);
out_err: out_err:
if (atomic_dec_and_test(&ccw_device_init_count)) if (adjust_init_count && atomic_dec_and_test(&ccw_device_init_count))
wake_up(&ccw_device_init_wq); wake_up(&ccw_device_init_wq);
} }