Skip to content

Commit

Permalink
[S390] cio: change locking in io_subchannel_remove
Browse files Browse the repository at this point in the history
IO subchannels are always unregistered in process context, so use
spin_lock_irq in the corresponding remove callback.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Sebastian Ott authored and Martin Schwidefsky committed Dec 7, 2009
1 parent 6e9a0f6 commit 7a8ad10
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/s390/cio/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -1065,17 +1065,16 @@ static int
io_subchannel_remove (struct subchannel *sch)
{
struct ccw_device *cdev;
unsigned long flags;

cdev = sch_get_cdev(sch);
if (!cdev)
goto out_free;
io_subchannel_quiesce(sch);
/* Set ccw device to not operational and drop reference. */
spin_lock_irqsave(cdev->ccwlock, flags);
spin_lock_irq(cdev->ccwlock);
sch_set_cdev(sch, NULL);
cdev->private->state = DEV_STATE_NOT_OPER;
spin_unlock_irqrestore(cdev->ccwlock, flags);
spin_unlock_irq(cdev->ccwlock);
ccw_device_unregister(cdev);
out_free:
kfree(sch->private);
Expand Down

0 comments on commit 7a8ad10

Please sign in to comment.