From: Andrey Markovytch <andreym@codeaurora.org>
Date: Wed, 29 Jun 2016 09:27:24 +0000 (+0300)
Subject: md: dm-req-crypt: fixed error propagation when ICE is used
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=18c50da9dcb44dcfec4cdb9ace68352a8923f518;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

md: dm-req-crypt: fixed error propagation when ICE is used

When ICE is used and there was an error during endio, the error was
not propagated properly to upper layers, fixed.

Change-Id: I5c428e4a02f7012f95e3a32486920e69b93ea3fc
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
---

diff --git a/drivers/md/dm-req-crypt.c b/drivers/md/dm-req-crypt.c
index dd3e9d97c75b..b2769a2a3c22 100644
--- a/drivers/md/dm-req-crypt.c
+++ b/drivers/md/dm-req-crypt.c
@@ -873,6 +873,7 @@ static int req_crypt_endio(struct dm_target *ti, struct request *clone,
 	/* If it is for ICE, free up req_io and return */
 	if (encryption_mode == DM_REQ_CRYPT_ENCRYPTION_MODE_TRANSPARENT) {
 		mempool_free(req_io, req_io_pool);
+		err = error;
 		goto submit_request;
 	}