From 3a2d4bd62ce9cff6cb94359b9815a9520348a185 Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Fri, 10 Oct 2008 13:37:06 +0100
Subject: [PATCH] --- yaml --- r: 110635 b: refs/heads/master c:
 6c031f41db15b6cb0cd33545cec28ca706cd3c7e h: refs/heads/master i:   110633:
 dec03276be44a506effba9dd149c81bf378dc40d   110631:
 22d8c0cefe59e6d6aba3734fe122d0746a4e6294 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 416eb865164d..92298f1ba9aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e37bb8e557a186d327eb4d1387953880ffc2cdd
+refs/heads/master: 6c031f41db15b6cb0cd33545cec28ca706cd3c7e
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index 0042636ad375..d8126ac82960 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/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);