aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index eecbfc8f8978..a77b4bfd452a 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2711,19 +2711,19 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
2711 dgs = (mdev->agreed_pro_version >= 87 && mdev->integrity_w_tfm) ? 2711 dgs = (mdev->agreed_pro_version >= 87 && mdev->integrity_w_tfm) ?
2712 crypto_hash_digestsize(mdev->integrity_w_tfm) : 0; 2712 crypto_hash_digestsize(mdev->integrity_w_tfm) : 0;
2713 2713
2714 if (req->size <= DRBD_MAX_SIZE_H80_PACKET) { 2714 if (req->i.size <= DRBD_MAX_SIZE_H80_PACKET) {
2715 p.head.h80.magic = cpu_to_be32(DRBD_MAGIC); 2715 p.head.h80.magic = cpu_to_be32(DRBD_MAGIC);
2716 p.head.h80.command = cpu_to_be16(P_DATA); 2716 p.head.h80.command = cpu_to_be16(P_DATA);
2717 p.head.h80.length = 2717 p.head.h80.length =
2718 cpu_to_be16(sizeof(p) - sizeof(union p_header) + dgs + req->size); 2718 cpu_to_be16(sizeof(p) - sizeof(union p_header) + dgs + req->i.size);
2719 } else { 2719 } else {
2720 p.head.h95.magic = cpu_to_be16(DRBD_MAGIC_BIG); 2720 p.head.h95.magic = cpu_to_be16(DRBD_MAGIC_BIG);
2721 p.head.h95.command = cpu_to_be16(P_DATA); 2721 p.head.h95.command = cpu_to_be16(P_DATA);
2722 p.head.h95.length = 2722 p.head.h95.length =
2723 cpu_to_be32(sizeof(p) - sizeof(union p_header) + dgs + req->size); 2723 cpu_to_be32(sizeof(p) - sizeof(union p_header) + dgs + req->i.size);
2724 } 2724 }
2725 2725
2726 p.sector = cpu_to_be64(req->sector); 2726 p.sector = cpu_to_be64(req->i.sector);
2727 p.block_id = (unsigned long)req; 2727 p.block_id = (unsigned long)req;
2728 p.seq_num = cpu_to_be32(req->seq_num = 2728 p.seq_num = cpu_to_be32(req->seq_num =
2729 atomic_add_return(1, &mdev->packet_seq)); 2729 atomic_add_return(1, &mdev->packet_seq));
@@ -2769,7 +2769,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
2769 if (memcmp(mdev->int_dig_out, digest, dgs)) { 2769 if (memcmp(mdev->int_dig_out, digest, dgs)) {
2770 dev_warn(DEV, 2770 dev_warn(DEV,
2771 "Digest mismatch, buffer modified by upper layers during write: %llus +%u\n", 2771 "Digest mismatch, buffer modified by upper layers during write: %llus +%u\n",
2772 (unsigned long long)req->sector, req->size); 2772 (unsigned long long)req->i.sector, req->i.size);
2773 } 2773 }
2774 } /* else if (dgs > 64) { 2774 } /* else if (dgs > 64) {
2775 ... Be noisy about digest too large ... 2775 ... Be noisy about digest too large ...
@@ -2837,8 +2837,8 @@ int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req)
2837{ 2837{
2838 struct p_block_desc p; 2838 struct p_block_desc p;
2839 2839
2840 p.sector = cpu_to_be64(req->sector); 2840 p.sector = cpu_to_be64(req->i.sector);
2841 p.blksize = cpu_to_be32(req->size); 2841 p.blksize = cpu_to_be32(req->i.size);
2842 2842
2843 return drbd_send_cmd(mdev, USE_DATA_SOCKET, P_OUT_OF_SYNC, &p.head, sizeof(p)); 2843 return drbd_send_cmd(mdev, USE_DATA_SOCKET, P_OUT_OF_SYNC, &p.head, sizeof(p));
2844} 2844}