summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher2011-04-27 21:00:12 +0200
committerPhilipp Reisner2012-11-08 16:52:58 +0100
commit5b614abe30645c3a528d54ff01da94fde0770c43 (patch)
treed49d1970be98a4c329b6092710e26c60c42a6c07 /drivers/block/drbd/drbd_main.c
parentdrbd: Rename integrity_w_tfm -> integrity_tfm (diff)
downloadkernel-qcow2-linux-5b614abe30645c3a528d54ff01da94fde0770c43.tar.gz
kernel-qcow2-linux-5b614abe30645c3a528d54ff01da94fde0770c43.tar.xz
kernel-qcow2-linux-5b614abe30645c3a528d54ff01da94fde0770c43.zip
drbd: Rename integrity_r_tfm -> peer_integrity_tfm
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_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 986470537a64..747223539fd0 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1405,8 +1405,8 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
void drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
struct p_data *dp, int data_size)
{
- data_size -= (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_r_tfm) ?
- crypto_hash_digestsize(mdev->tconn->integrity_r_tfm) : 0;
+ data_size -= (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->peer_integrity_tfm) ?
+ crypto_hash_digestsize(mdev->tconn->peer_integrity_tfm) : 0;
_drbd_send_ack(mdev, cmd, dp->sector, cpu_to_be32(data_size),
dp->block_id);
}
@@ -2407,7 +2407,7 @@ void conn_free_crypto(struct drbd_tconn *tconn)
crypto_free_hash(tconn->verify_tfm);
crypto_free_hash(tconn->cram_hmac_tfm);
crypto_free_hash(tconn->integrity_tfm);
- crypto_free_hash(tconn->integrity_r_tfm);
+ crypto_free_hash(tconn->peer_integrity_tfm);
kfree(tconn->int_dig_in);
kfree(tconn->int_dig_vv);
@@ -2415,7 +2415,7 @@ void conn_free_crypto(struct drbd_tconn *tconn)
tconn->verify_tfm = NULL;
tconn->cram_hmac_tfm = NULL;
tconn->integrity_tfm = NULL;
- tconn->integrity_r_tfm = NULL;
+ tconn->peer_integrity_tfm = NULL;
tconn->int_dig_in = NULL;
tconn->int_dig_vv = NULL;
}