diff options
| author | Milan Broz <mbroz@redhat.com> | 2008-10-10 13:37:06 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2008-10-10 13:37:06 +0100 |
| commit | 6c031f41db15b6cb0cd33545cec28ca706cd3c7e (patch) | |
| tree | 85434cd7db8ff2e8dc82f5821a9cd3b31ffeb86c | |
| parent | 1e37bb8e557a186d327eb4d1387953880ffc2cdd (diff) | |
| download | linux-3.10-6c031f41db15b6cb0cd33545cec28ca706cd3c7e.tar.gz linux-3.10-6c031f41db15b6cb0cd33545cec28ca706cd3c7e.tar.bz2 linux-3.10-6c031f41db15b6cb0cd33545cec28ca706cd3c7e.zip | |
dm crypt: move dec_pending on error into write_io_submit
Make kcryptd_crypt_write_io_submit() responsible for decrementing
the pending count after an error.
Also fixes a bug in the async path that forgot to decrement it.
Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
| -rw-r--r-- | drivers/md/dm-crypt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 0042636ad37..d8126ac8296 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -674,6 +674,7 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, crypt_free_buffer_pages(cc, clone); bio_put(clone); io->error = -EIO; + crypt_dec_pending(io); return; } @@ -724,10 +725,8 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) /* processed, no running async crypto */ crypt_inc_pending(io); kcryptd_crypt_write_io_submit(io, r, 0); - if (unlikely(r < 0)) { - crypt_dec_pending(io); + if (unlikely(r < 0)) break; - } } else crypt_inc_pending(io); |