diff options
| author |   Ralph Wuerthner <rwuerthn@de.ibm.com> | 2007-03-26 20:42:43 +0200 |
|---|---|---|
| committer |   Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-03-26 20:43:47 +0200 |
| commit | e675c0d2bf523a80098c843603ccc091d3720fb4 (patch) | |
| tree | 058e1373752e83d0b635676746afa11ddbc18544 /drivers/s390/crypto | |
| parent | [S390] zcrypt: Fix possible dead lock in AP bus module. (diff) | |
| download | linux-dev-e675c0d2bf523a80098c843603ccc091d3720fb4.tar.xz linux-dev-e675c0d2bf523a80098c843603ccc091d3720fb4.zip | |
[S390] zcrypt: Fix ap_poll_requests counter in lost requests error path.
In the unlikely event that an AP device lost requests, don't forget to
update the ap_poll_requests counter too. Same must happen in case an AP
device is removed while there are still outstanding requests.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/crypto')
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index a817dade37c0..bf37cdf43fae 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -505,6 +505,9 @@ static int ap_device_remove(struct device *dev) spin_lock_bh(&ap_device_lock); list_del_init(&ap_dev->list); spin_unlock_bh(&ap_device_lock); + spin_lock_bh(&ap_dev->lock); + atomic_sub(ap_dev->queue_count, &ap_poll_requests); + spin_unlock_bh(&ap_dev->lock); return 0; } @@ -867,6 +870,7 @@ static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags) case AP_RESPONSE_NO_PENDING_REPLY: if (status.queue_empty) { /* The card shouldn't forget requests but who knows. */ + atomic_sub(ap_dev->queue_count, &ap_poll_requests); ap_dev->queue_count = 0; list_splice_init(&ap_dev->pendingq, &ap_dev->requestq); ap_dev->requestq_count += ap_dev->pendingq_count; |