[PATCH] Fix dmsetup table output change

[linux.git] / drivers / md / dm-crypt.c

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index a625576fdeeb3eb5c5ac1c7ebc15f3aea841df39..08a40f4e4f60332f370f180a89124fe26ee3e85b 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/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))