diff options
| author | Andreas Gruenbacher | 2011-07-15 16:48:49 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:57:55 +0100 |
| commit | b792c35cfb336b456e9e2455082ff12d4a76b98f (patch) | |
| tree | d7d2e4b31de8cd939f37381f183890fa65a3d1f4 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Print memory address in hex instead of decimal in error message (diff) | |
| download | kernel-qcow2-linux-b792c35cfb336b456e9e2455082ff12d4a76b98f.tar.gz kernel-qcow2-linux-b792c35cfb336b456e9e2455082ff12d4a76b98f.tar.xz kernel-qcow2-linux-b792c35cfb336b456e9e2455082ff12d4a76b98f.zip | |
drbd: receive_protocol(): Give variables more easily searchable names
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index bfbc10352faa..11f2e7273e13 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3002,7 +3002,7 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) int p_proto, p_discard_my_data, p_two_primaries, cf; struct net_conf *nc, *old_net_conf, *new_net_conf = NULL; char integrity_alg[SHARED_SECRET_MAX] = ""; - struct crypto_hash *peer_tfm = NULL, *tfm = NULL; + struct crypto_hash *peer_integrity_tfm = NULL, *integrity_tfm = NULL; void *int_dig_in = NULL, *int_dig_vv = NULL; p_proto = be32_to_cpu(p->protocol); @@ -3028,15 +3028,15 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) if (integrity_alg[0]) { int hash_size; - peer_tfm = crypto_alloc_hash(integrity_alg, 0, CRYPTO_ALG_ASYNC); - tfm = crypto_alloc_hash(integrity_alg, 0, CRYPTO_ALG_ASYNC); - if (!(peer_tfm && tfm)) { + peer_integrity_tfm = crypto_alloc_hash(integrity_alg, 0, CRYPTO_ALG_ASYNC); + integrity_tfm = crypto_alloc_hash(integrity_alg, 0, CRYPTO_ALG_ASYNC); + if (!(peer_integrity_tfm && integrity_tfm)) { conn_err(tconn, "peer data-integrity-alg %s not supported\n", integrity_alg); goto disconnect; } - hash_size = crypto_hash_digestsize(tfm); + hash_size = crypto_hash_digestsize(integrity_tfm); int_dig_in = kmalloc(hash_size, GFP_KERNEL); int_dig_vv = kmalloc(hash_size, GFP_KERNEL); if (!(int_dig_in && int_dig_vv)) { @@ -3065,7 +3065,7 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) new_net_conf->integrity_alg_len = strlen(integrity_alg) + 1; crypto_free_hash(tconn->integrity_tfm); - tconn->integrity_tfm = tfm; + tconn->integrity_tfm = integrity_tfm; rcu_assign_pointer(tconn->net_conf, new_net_conf); mutex_unlock(&tconn->conf_update); @@ -3074,7 +3074,7 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) crypto_free_hash(tconn->peer_integrity_tfm); kfree(tconn->int_dig_in); kfree(tconn->int_dig_vv); - tconn->peer_integrity_tfm = peer_tfm; + tconn->peer_integrity_tfm = peer_integrity_tfm; tconn->int_dig_in = int_dig_in; tconn->int_dig_vv = int_dig_vv; @@ -3137,8 +3137,8 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) disconnect_rcu_unlock: rcu_read_unlock(); disconnect: - crypto_free_hash(peer_tfm); - crypto_free_hash(tfm); + crypto_free_hash(peer_integrity_tfm); + crypto_free_hash(integrity_tfm); kfree(int_dig_in); kfree(int_dig_vv); conn_request_state(tconn, NS(conn, C_DISCONNECTING), CS_HARD); |