diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-08-08 20:49:01 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 10:49:36 -0500 |
commit | 79a3c8d38cabd1a900340852e527b0a4ce8a459d (patch) | |
tree | 6fb1960556f05c84749c54ed124ccb47a0127e2e /drivers/block | |
parent | 753c619195bc6b5bb799942ed1eeffe21b26b68c (diff) |
drbd: drbd_csum_bio(), drbd_csum_ee(): Remove unused device argument
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 5 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 4 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_worker.c | 13 |
4 files changed, 13 insertions, 15 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index cf605fa0b9da..4f4d2dbe1bb9 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -1320,9 +1320,8 @@ static inline void ov_out_of_sync_print(struct drbd_device *device) | |||
1320 | } | 1320 | } |
1321 | 1321 | ||
1322 | 1322 | ||
1323 | extern void drbd_csum_bio(struct drbd_device *, struct crypto_hash *, struct bio *, void *); | 1323 | extern void drbd_csum_bio(struct crypto_hash *, struct bio *, void *); |
1324 | extern void drbd_csum_ee(struct drbd_device *, struct crypto_hash *, | 1324 | extern void drbd_csum_ee(struct crypto_hash *, struct drbd_peer_request *, void *); |
1325 | struct drbd_peer_request *, void *); | ||
1326 | /* worker callbacks */ | 1325 | /* worker callbacks */ |
1327 | extern int w_e_end_data_req(struct drbd_work *, int); | 1326 | extern int w_e_end_data_req(struct drbd_work *, int); |
1328 | extern int w_e_end_rsdata_req(struct drbd_work *, int); | 1327 | extern int w_e_end_rsdata_req(struct drbd_work *, int); |
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f7b6bfbab163..8f178fb54f26 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -1646,7 +1646,7 @@ int drbd_send_dblock(struct drbd_device *device, struct drbd_request *req) | |||
1646 | } | 1646 | } |
1647 | p->dp_flags = cpu_to_be32(dp_flags); | 1647 | p->dp_flags = cpu_to_be32(dp_flags); |
1648 | if (dgs) | 1648 | if (dgs) |
1649 | drbd_csum_bio(device, first_peer_device(device)->connection->integrity_tfm, req->master_bio, p + 1); | 1649 | drbd_csum_bio(first_peer_device(device)->connection->integrity_tfm, req->master_bio, p + 1); |
1650 | err = __send_command(first_peer_device(device)->connection, device->vnr, sock, P_DATA, sizeof(*p) + dgs, NULL, req->i.size); | 1650 | err = __send_command(first_peer_device(device)->connection, device->vnr, sock, P_DATA, sizeof(*p) + dgs, NULL, req->i.size); |
1651 | if (!err) { | 1651 | if (!err) { |
1652 | /* For protocol A, we have to memcpy the payload into | 1652 | /* For protocol A, we have to memcpy the payload into |
@@ -1670,7 +1670,7 @@ int drbd_send_dblock(struct drbd_device *device, struct drbd_request *req) | |||
1670 | /* 64 byte, 512 bit, is the largest digest size | 1670 | /* 64 byte, 512 bit, is the largest digest size |
1671 | * currently supported in kernel crypto. */ | 1671 | * currently supported in kernel crypto. */ |
1672 | unsigned char digest[64]; | 1672 | unsigned char digest[64]; |
1673 | drbd_csum_bio(device, first_peer_device(device)->connection->integrity_tfm, req->master_bio, digest); | 1673 | drbd_csum_bio(first_peer_device(device)->connection->integrity_tfm, req->master_bio, digest); |
1674 | if (memcmp(p + 1, digest, dgs)) { | 1674 | if (memcmp(p + 1, digest, dgs)) { |
1675 | drbd_warn(device, | 1675 | drbd_warn(device, |
1676 | "Digest mismatch, buffer modified by upper layers during write: %llus +%u\n", | 1676 | "Digest mismatch, buffer modified by upper layers during write: %llus +%u\n", |
@@ -1710,7 +1710,7 @@ int drbd_send_block(struct drbd_device *device, enum drbd_packet cmd, | |||
1710 | p->seq_num = 0; /* unused */ | 1710 | p->seq_num = 0; /* unused */ |
1711 | p->dp_flags = 0; | 1711 | p->dp_flags = 0; |
1712 | if (dgs) | 1712 | if (dgs) |
1713 | drbd_csum_ee(device, first_peer_device(device)->connection->integrity_tfm, peer_req, p + 1); | 1713 | drbd_csum_ee(first_peer_device(device)->connection->integrity_tfm, peer_req, p + 1); |
1714 | err = __send_command(first_peer_device(device)->connection, device->vnr, sock, cmd, sizeof(*p) + dgs, NULL, peer_req->i.size); | 1714 | err = __send_command(first_peer_device(device)->connection, device->vnr, sock, cmd, sizeof(*p) + dgs, NULL, peer_req->i.size); |
1715 | if (!err) | 1715 | if (!err) |
1716 | err = _drbd_send_zc_ee(device, peer_req); | 1716 | err = _drbd_send_zc_ee(device, peer_req); |
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index c5fd1cfaaab8..a4655e579ed6 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -1560,7 +1560,7 @@ read_in_block(struct drbd_device *device, u64 id, sector_t sector, | |||
1560 | } | 1560 | } |
1561 | 1561 | ||
1562 | if (dgs) { | 1562 | if (dgs) { |
1563 | drbd_csum_ee(device, first_peer_device(device)->connection->peer_integrity_tfm, peer_req, dig_vv); | 1563 | drbd_csum_ee(first_peer_device(device)->connection->peer_integrity_tfm, peer_req, dig_vv); |
1564 | if (memcmp(dig_in, dig_vv, dgs)) { | 1564 | if (memcmp(dig_in, dig_vv, dgs)) { |
1565 | drbd_err(device, "Digest integrity check FAILED: %llus +%u\n", | 1565 | drbd_err(device, "Digest integrity check FAILED: %llus +%u\n", |
1566 | (unsigned long long)sector, data_size); | 1566 | (unsigned long long)sector, data_size); |
@@ -1637,7 +1637,7 @@ static int recv_dless_read(struct drbd_device *device, struct drbd_request *req, | |||
1637 | } | 1637 | } |
1638 | 1638 | ||
1639 | if (dgs) { | 1639 | if (dgs) { |
1640 | drbd_csum_bio(device, first_peer_device(device)->connection->peer_integrity_tfm, bio, dig_vv); | 1640 | drbd_csum_bio(first_peer_device(device)->connection->peer_integrity_tfm, bio, dig_vv); |
1641 | if (memcmp(dig_in, dig_vv, dgs)) { | 1641 | if (memcmp(dig_in, dig_vv, dgs)) { |
1642 | drbd_err(device, "Digest integrity check FAILED. Broken NICs?\n"); | 1642 | drbd_err(device, "Digest integrity check FAILED. Broken NICs?\n"); |
1643 | return -EINVAL; | 1643 | return -EINVAL; |
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 1ba8f8ec1525..b587b8421aa5 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
@@ -282,8 +282,7 @@ void drbd_request_endio(struct bio *bio, int error) | |||
282 | complete_master_bio(device, &m); | 282 | complete_master_bio(device, &m); |
283 | } | 283 | } |
284 | 284 | ||
285 | void drbd_csum_ee(struct drbd_device *device, struct crypto_hash *tfm, | 285 | void drbd_csum_ee(struct crypto_hash *tfm, struct drbd_peer_request *peer_req, void *digest) |
286 | struct drbd_peer_request *peer_req, void *digest) | ||
287 | { | 286 | { |
288 | struct hash_desc desc; | 287 | struct hash_desc desc; |
289 | struct scatterlist sg; | 288 | struct scatterlist sg; |
@@ -310,7 +309,7 @@ void drbd_csum_ee(struct drbd_device *device, struct crypto_hash *tfm, | |||
310 | crypto_hash_final(&desc, digest); | 309 | crypto_hash_final(&desc, digest); |
311 | } | 310 | } |
312 | 311 | ||
313 | void drbd_csum_bio(struct drbd_device *device, struct crypto_hash *tfm, struct bio *bio, void *digest) | 312 | void drbd_csum_bio(struct crypto_hash *tfm, struct bio *bio, void *digest) |
314 | { | 313 | { |
315 | struct hash_desc desc; | 314 | struct hash_desc desc; |
316 | struct scatterlist sg; | 315 | struct scatterlist sg; |
@@ -350,7 +349,7 @@ static int w_e_send_csum(struct drbd_work *w, int cancel) | |||
350 | if (digest) { | 349 | if (digest) { |
351 | sector_t sector = peer_req->i.sector; | 350 | sector_t sector = peer_req->i.sector; |
352 | unsigned int size = peer_req->i.size; | 351 | unsigned int size = peer_req->i.size; |
353 | drbd_csum_ee(device, first_peer_device(device)->connection->csums_tfm, peer_req, digest); | 352 | drbd_csum_ee(first_peer_device(device)->connection->csums_tfm, peer_req, digest); |
354 | /* Free peer_req and pages before send. | 353 | /* Free peer_req and pages before send. |
355 | * In case we block on congestion, we could otherwise run into | 354 | * In case we block on congestion, we could otherwise run into |
356 | * some distributed deadlock, if the other side blocks on | 355 | * some distributed deadlock, if the other side blocks on |
@@ -1103,7 +1102,7 @@ int w_e_end_csum_rs_req(struct drbd_work *w, int cancel) | |||
1103 | digest = kmalloc(digest_size, GFP_NOIO); | 1102 | digest = kmalloc(digest_size, GFP_NOIO); |
1104 | } | 1103 | } |
1105 | if (digest) { | 1104 | if (digest) { |
1106 | drbd_csum_ee(device, first_peer_device(device)->connection->csums_tfm, peer_req, digest); | 1105 | drbd_csum_ee(first_peer_device(device)->connection->csums_tfm, peer_req, digest); |
1107 | eq = !memcmp(digest, di->digest, digest_size); | 1106 | eq = !memcmp(digest, di->digest, digest_size); |
1108 | kfree(digest); | 1107 | kfree(digest); |
1109 | } | 1108 | } |
@@ -1155,7 +1154,7 @@ int w_e_end_ov_req(struct drbd_work *w, int cancel) | |||
1155 | } | 1154 | } |
1156 | 1155 | ||
1157 | if (likely(!(peer_req->flags & EE_WAS_ERROR))) | 1156 | if (likely(!(peer_req->flags & EE_WAS_ERROR))) |
1158 | drbd_csum_ee(device, first_peer_device(device)->connection->verify_tfm, peer_req, digest); | 1157 | drbd_csum_ee(first_peer_device(device)->connection->verify_tfm, peer_req, digest); |
1159 | else | 1158 | else |
1160 | memset(digest, 0, digest_size); | 1159 | memset(digest, 0, digest_size); |
1161 | 1160 | ||
@@ -1221,7 +1220,7 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel) | |||
1221 | digest_size = crypto_hash_digestsize(first_peer_device(device)->connection->verify_tfm); | 1220 | digest_size = crypto_hash_digestsize(first_peer_device(device)->connection->verify_tfm); |
1222 | digest = kmalloc(digest_size, GFP_NOIO); | 1221 | digest = kmalloc(digest_size, GFP_NOIO); |
1223 | if (digest) { | 1222 | if (digest) { |
1224 | drbd_csum_ee(device, first_peer_device(device)->connection->verify_tfm, peer_req, digest); | 1223 | drbd_csum_ee(first_peer_device(device)->connection->verify_tfm, peer_req, digest); |
1225 | 1224 | ||
1226 | D_ASSERT(device, digest_size == di->digest_size); | 1225 | D_ASSERT(device, digest_size == di->digest_size); |
1227 | eq = !memcmp(digest, di->digest, digest_size); | 1226 | eq = !memcmp(digest, di->digest, digest_size); |