diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-04-27 15:00:12 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:52:58 -0500 |
commit | 5b614abe30645c3a528d54ff01da94fde0770c43 (patch) | |
tree | d49d1970be98a4c329b6092710e26c60c42a6c07 /drivers/block/drbd/drbd_receiver.c | |
parent | 8d412fc6d58ae5e2e43f84461dd123bd0168b310 (diff) |
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_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 98f03b143b38..36b846bcdda2 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -1384,8 +1384,8 @@ read_in_block(struct drbd_conf *mdev, u64 id, sector_t sector, | |||
1384 | void *dig_vv = mdev->tconn->int_dig_vv; | 1384 | void *dig_vv = mdev->tconn->int_dig_vv; |
1385 | unsigned long *data; | 1385 | unsigned long *data; |
1386 | 1386 | ||
1387 | dgs = (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_r_tfm) ? | 1387 | dgs = (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->peer_integrity_tfm) ? |
1388 | crypto_hash_digestsize(mdev->tconn->integrity_r_tfm) : 0; | 1388 | crypto_hash_digestsize(mdev->tconn->peer_integrity_tfm) : 0; |
1389 | 1389 | ||
1390 | if (dgs) { | 1390 | if (dgs) { |
1391 | /* | 1391 | /* |
@@ -1442,7 +1442,7 @@ read_in_block(struct drbd_conf *mdev, u64 id, sector_t sector, | |||
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | if (dgs) { | 1444 | if (dgs) { |
1445 | drbd_csum_ee(mdev, mdev->tconn->integrity_r_tfm, peer_req, dig_vv); | 1445 | drbd_csum_ee(mdev, mdev->tconn->peer_integrity_tfm, peer_req, dig_vv); |
1446 | if (memcmp(dig_in, dig_vv, dgs)) { | 1446 | if (memcmp(dig_in, dig_vv, dgs)) { |
1447 | dev_err(DEV, "Digest integrity check FAILED: %llus +%u\n", | 1447 | dev_err(DEV, "Digest integrity check FAILED: %llus +%u\n", |
1448 | (unsigned long long)sector, data_size); | 1448 | (unsigned long long)sector, data_size); |
@@ -1491,8 +1491,8 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, | |||
1491 | void *dig_in = mdev->tconn->int_dig_in; | 1491 | void *dig_in = mdev->tconn->int_dig_in; |
1492 | void *dig_vv = mdev->tconn->int_dig_vv; | 1492 | void *dig_vv = mdev->tconn->int_dig_vv; |
1493 | 1493 | ||
1494 | dgs = (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_r_tfm) ? | 1494 | dgs = (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->peer_integrity_tfm) ? |
1495 | crypto_hash_digestsize(mdev->tconn->integrity_r_tfm) : 0; | 1495 | crypto_hash_digestsize(mdev->tconn->peer_integrity_tfm) : 0; |
1496 | 1496 | ||
1497 | if (dgs) { | 1497 | if (dgs) { |
1498 | err = drbd_recv_all_warn(mdev->tconn, dig_in, dgs); | 1498 | err = drbd_recv_all_warn(mdev->tconn, dig_in, dgs); |
@@ -1520,7 +1520,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, | |||
1520 | } | 1520 | } |
1521 | 1521 | ||
1522 | if (dgs) { | 1522 | if (dgs) { |
1523 | drbd_csum_bio(mdev, mdev->tconn->integrity_r_tfm, bio, dig_vv); | 1523 | drbd_csum_bio(mdev, mdev->tconn->peer_integrity_tfm, bio, dig_vv); |
1524 | if (memcmp(dig_in, dig_vv, dgs)) { | 1524 | if (memcmp(dig_in, dig_vv, dgs)) { |
1525 | dev_err(DEV, "Digest integrity check FAILED. Broken NICs?\n"); | 1525 | dev_err(DEV, "Digest integrity check FAILED. Broken NICs?\n"); |
1526 | return -EINVAL; | 1526 | return -EINVAL; |