From b48f9deafff69187e47dbaeb76f82422018118be Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Fri, 10 Oct 2008 13:37:07 +0100
Subject: [PATCH] --- yaml --- r: 110636 b: refs/heads/master c:
 4e59409891c9cc30cb4d5d73250b0c968af8e39b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-crypt.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 92298f1ba9aa..093aacfbcd57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c031f41db15b6cb0cd33545cec28ca706cd3c7e
+refs/heads/master: 4e59409891c9cc30cb4d5d73250b0c968af8e39b
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index d8126ac82960..262ed1816695 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/drivers/md/dm-crypt.c
@@ -719,16 +719,15 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
 
 		remaining -= clone->bi_size;
 
+		crypt_inc_pending(io);
 		r = crypt_convert(cc, &io->ctx);
 
 		if (atomic_dec_and_test(&io->ctx.pending)) {
 			/* processed, no running async crypto  */
-			crypt_inc_pending(io);
 			kcryptd_crypt_write_io_submit(io, r, 0);
 			if (unlikely(r < 0))
 				break;
-		} else
-			crypt_inc_pending(io);
+		}
 
 		/* out of memory -> run queues */
 		if (unlikely(remaining)) {