dm crypt: tidy whitespace
Clean up, convert some spaces to tabs. No functional change here. Signed-off-by: Milan Broz <mbroz@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
parent
cabf08e4d3
commit
d469f84197
|
@ -56,7 +56,7 @@ struct crypt_config;
|
||||||
|
|
||||||
struct crypt_iv_operations {
|
struct crypt_iv_operations {
|
||||||
int (*ctr)(struct crypt_config *cc, struct dm_target *ti,
|
int (*ctr)(struct crypt_config *cc, struct dm_target *ti,
|
||||||
const char *opts);
|
const char *opts);
|
||||||
void (*dtr)(struct crypt_config *cc);
|
void (*dtr)(struct crypt_config *cc);
|
||||||
const char *(*status)(struct crypt_config *cc);
|
const char *(*status)(struct crypt_config *cc);
|
||||||
int (*generator)(struct crypt_config *cc, u8 *iv, sector_t sector);
|
int (*generator)(struct crypt_config *cc, u8 *iv, sector_t sector);
|
||||||
|
@ -138,7 +138,7 @@ static int crypt_iv_plain_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
|
static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
|
||||||
const char *opts)
|
const char *opts)
|
||||||
{
|
{
|
||||||
struct crypto_cipher *essiv_tfm;
|
struct crypto_cipher *essiv_tfm;
|
||||||
struct crypto_hash *hash_tfm;
|
struct crypto_hash *hash_tfm;
|
||||||
|
@ -190,7 +190,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
|
||||||
if (crypto_cipher_blocksize(essiv_tfm) !=
|
if (crypto_cipher_blocksize(essiv_tfm) !=
|
||||||
crypto_blkcipher_ivsize(cc->tfm)) {
|
crypto_blkcipher_ivsize(cc->tfm)) {
|
||||||
ti->error = "Block size of ESSIV cipher does "
|
ti->error = "Block size of ESSIV cipher does "
|
||||||
"not match IV size of block cipher";
|
"not match IV size of block cipher";
|
||||||
crypto_free_cipher(essiv_tfm);
|
crypto_free_cipher(essiv_tfm);
|
||||||
kfree(salt);
|
kfree(salt);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -321,10 +321,10 @@ crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void crypt_convert_init(struct crypt_config *cc,
|
||||||
crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx,
|
struct convert_context *ctx,
|
||||||
struct bio *bio_out, struct bio *bio_in,
|
struct bio *bio_out, struct bio *bio_in,
|
||||||
sector_t sector, int write)
|
sector_t sector, int write)
|
||||||
{
|
{
|
||||||
ctx->bio_in = bio_in;
|
ctx->bio_in = bio_in;
|
||||||
ctx->bio_out = bio_out;
|
ctx->bio_out = bio_out;
|
||||||
|
@ -340,7 +340,7 @@ crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx,
|
||||||
* Encrypt / decrypt data from one bio to another one (can be the same one)
|
* Encrypt / decrypt data from one bio to another one (can be the same one)
|
||||||
*/
|
*/
|
||||||
static int crypt_convert(struct crypt_config *cc,
|
static int crypt_convert(struct crypt_config *cc,
|
||||||
struct convert_context *ctx)
|
struct convert_context *ctx)
|
||||||
{
|
{
|
||||||
int r = 0;
|
int r = 0;
|
||||||
|
|
||||||
|
@ -372,7 +372,7 @@ static int crypt_convert(struct crypt_config *cc,
|
||||||
}
|
}
|
||||||
|
|
||||||
r = crypt_convert_scatterlist(cc, &sg_out, &sg_in, sg_in.length,
|
r = crypt_convert_scatterlist(cc, &sg_out, &sg_in, sg_in.length,
|
||||||
ctx->write, ctx->sector);
|
ctx->write, ctx->sector);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -382,13 +382,13 @@ static int crypt_convert(struct crypt_config *cc,
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dm_crypt_bio_destructor(struct bio *bio)
|
static void dm_crypt_bio_destructor(struct bio *bio)
|
||||||
{
|
{
|
||||||
struct dm_crypt_io *io = bio->bi_private;
|
struct dm_crypt_io *io = bio->bi_private;
|
||||||
struct crypt_config *cc = io->target->private;
|
struct crypt_config *cc = io->target->private;
|
||||||
|
|
||||||
bio_free(bio, cc->bs);
|
bio_free(bio, cc->bs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generate a new unfragmented bio with the given size
|
* Generate a new unfragmented bio with the given size
|
||||||
|
@ -715,7 +715,7 @@ static int crypt_set_key(struct crypt_config *cc, char *key)
|
||||||
cc->key_size = key_size; /* initial settings */
|
cc->key_size = key_size; /* initial settings */
|
||||||
|
|
||||||
if ((!key_size && strcmp(key, "-")) ||
|
if ((!key_size && strcmp(key, "-")) ||
|
||||||
(key_size && crypt_decode_key(cc->key, key, key_size) < 0))
|
(key_size && crypt_decode_key(cc->key, key, key_size) < 0))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
|
set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
|
||||||
|
@ -785,8 +785,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
||||||
goto bad1;
|
goto bad1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)", chainmode,
|
if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)",
|
||||||
cipher) >= CRYPTO_MAX_ALG_NAME) {
|
chainmode, cipher) >= CRYPTO_MAX_ALG_NAME) {
|
||||||
ti->error = "Chain mode + cipher name is too long";
|
ti->error = "Chain mode + cipher name is too long";
|
||||||
goto bad1;
|
goto bad1;
|
||||||
}
|
}
|
||||||
|
@ -829,7 +829,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
||||||
if (cc->iv_size)
|
if (cc->iv_size)
|
||||||
/* at least a 64 bit sector number should fit in our buffer */
|
/* at least a 64 bit sector number should fit in our buffer */
|
||||||
cc->iv_size = max(cc->iv_size,
|
cc->iv_size = max(cc->iv_size,
|
||||||
(unsigned int)(sizeof(u64) / sizeof(u8)));
|
(unsigned int)(sizeof(u64) / sizeof(u8)));
|
||||||
else {
|
else {
|
||||||
if (cc->iv_gen_ops) {
|
if (cc->iv_gen_ops) {
|
||||||
DMWARN("Selected cipher does not support IVs");
|
DMWARN("Selected cipher does not support IVs");
|
||||||
|
@ -875,7 +875,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
||||||
cc->start = tmpll;
|
cc->start = tmpll;
|
||||||
|
|
||||||
if (dm_get_device(ti, argv[3], cc->start, ti->len,
|
if (dm_get_device(ti, argv[3], cc->start, ti->len,
|
||||||
dm_table_get_mode(ti->table), &cc->dev)) {
|
dm_table_get_mode(ti->table), &cc->dev)) {
|
||||||
ti->error = "Device lookup failed";
|
ti->error = "Device lookup failed";
|
||||||
goto bad5;
|
goto bad5;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue