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>

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);