From 3e02d0ba4a4f8c8b56f368509cd5e0caf083e140 Mon Sep 17 00:00:00 2001
From: Christophe Saout <christophe@saout.de>
Date: Mon, 30 Oct 2006 20:39:08 +0100
Subject: [PATCH] --- yaml --- r: 40464 b: refs/heads/master c:
 37af6560f7978c60791b5f3df17ce8b3e97f2d6e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6abfe26bd467..223ea62064f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1b707d253fe918b92882cff1dbd926b47e14fd2
+refs/heads/master: 37af6560f7978c60791b5f3df17ce8b3e97f2d6e
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index a625576fdeeb..08a40f4e4f60 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/drivers/md/dm-crypt.c
@@ -915,8 +915,6 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
 			char *result, unsigned int maxlen)
 {
 	struct crypt_config *cc = (struct crypt_config *) ti->private;
-	const char *cipher;
-	const char *chainmode = NULL;
 	unsigned int sz = 0;
 
 	switch (type) {
@@ -925,14 +923,11 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
 		break;
 
 	case STATUSTYPE_TABLE:
-		cipher = crypto_blkcipher_name(cc->tfm);
-
-		chainmode = cc->chainmode;
-
 		if (cc->iv_mode)
-			DMEMIT("%s-%s-%s ", cipher, chainmode, cc->iv_mode);
+			DMEMIT("%s-%s-%s ", cc->cipher, cc->chainmode,
+			       cc->iv_mode);
 		else
-			DMEMIT("%s-%s ", cipher, chainmode);
+			DMEMIT("%s-%s ", cc->cipher, cc->chainmode);
 
 		if (cc->key_size > 0) {
 			if ((maxlen - sz) < ((cc->key_size << 1) + 1))