[dm-devel] [PATCH 14/20] dm-crypt: move error handling to crypt_convert.

[Mikulas Patocka]

This patch moves error handling to crypt_convert and makes crypt_convert
return void instead of the error number.

Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
---
 drivers/md/dm-crypt.c |   24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index bb11a95..6f18838 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -825,16 +825,16 @@ static void crypt_dec_cc_pending(struct dm_crypt_io *io)
 /*
  * Encrypt / decrypt data from one bio to another one (can be the same one)
  */
-static int crypt_convert(struct crypt_config *cc,
-			 struct dm_crypt_io *io)
+static void crypt_convert(struct crypt_config *cc,
+			  struct dm_crypt_io *io)
 {
-	int r;
 	LIST_HEAD(batch);
 	unsigned batch_count = 0;
 
 	atomic_set(&io->cc_pending, 1);
 
 	while (1) {
+		int r;
 		struct ablkcipher_request *req = crypt_alloc_req(cc, io, GFP_NOWAIT);
 		if (!req) {
 			/*
@@ -849,8 +849,9 @@ static int crypt_convert(struct crypt_config *cc,
 		r = crypt_convert_block(cc, io, req, &batch);
 		if (unlikely(r < 0)) {
 			crypt_flush_batch(cc, &batch);
+			io->error = -EIO;
 			crypt_dec_cc_pending(io);
-			goto ret;
+			return;
 		}
 
 		io->sector++;
@@ -866,12 +867,8 @@ static int crypt_convert(struct crypt_config *cc,
 		}
 		break;
 	}
-	r = 0;
 
 	crypt_flush_batch(cc, &batch);
-ret:
-
-	return r;
 }
 
 static void dm_crypt_bio_destructor(struct bio *bio)
@@ -1134,7 +1131,6 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
 	struct bio *clone;
 	unsigned remaining = io->base_bio->bi_size;
 	sector_t sector = io->sector;
-	int r;
 
 	/*
 	 * Prevent io from disappearing until this function completes.
@@ -1155,9 +1151,7 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
 	sector += bio_sectors(clone);
 
 	crypt_inc_pending(io);
-	r = crypt_convert(cc, io);
-	if (r)
-		io->error = -EIO;
+	crypt_convert(cc, io);
 dec:
 	crypt_dec_pending(io);
 }
@@ -1165,17 +1159,13 @@ dec:
 static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)
 {
 	struct crypt_config *cc = io->cc;
-	int r = 0;
 
 	crypt_inc_pending(io);
 
 	crypt_convert_init(cc, io, io->base_bio, io->base_bio,
 			   io->sector);
 
-	r = crypt_convert(cc, io);
-	if (r < 0)
-		io->error = -EIO;
-
+	crypt_convert(cc, io);
 	crypt_dec_pending(io);
 }
 
-- 
1.7.10.4