Commit 5e54c2a6 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe
parent 8164dd6c
...@@ -127,8 +127,8 @@ struct bm_xfer_ctx { ...@@ -127,8 +127,8 @@ struct bm_xfer_ctx {
unsigned bytes[2]; unsigned bytes[2];
}; };
extern void INFO_bm_xfer_stats(struct drbd_device *device, extern void INFO_bm_xfer_stats(struct drbd_peer_device *peer_device,
const char *direction, struct bm_xfer_ctx *c); const char *direction, struct bm_xfer_ctx *c);
static inline void bm_xfer_ctx_bit_to_word_offset(struct bm_xfer_ctx *c) static inline void bm_xfer_ctx_bit_to_word_offset(struct bm_xfer_ctx *c)
{ {
......
...@@ -1247,7 +1247,7 @@ send_bitmap_rle_or_plain(struct drbd_peer_device *peer_device, struct bm_xfer_ct ...@@ -1247,7 +1247,7 @@ send_bitmap_rle_or_plain(struct drbd_peer_device *peer_device, struct bm_xfer_ct
} }
if (!err) { if (!err) {
if (len == 0) { if (len == 0) {
INFO_bm_xfer_stats(device, "send", c); INFO_bm_xfer_stats(peer_device, "send", c);
return 0; return 0;
} else } else
return 1; return 1;
......
...@@ -4766,11 +4766,11 @@ decode_bitmap_c(struct drbd_peer_device *peer_device, ...@@ -4766,11 +4766,11 @@ decode_bitmap_c(struct drbd_peer_device *peer_device,
return -EIO; return -EIO;
} }
void INFO_bm_xfer_stats(struct drbd_device *device, void INFO_bm_xfer_stats(struct drbd_peer_device *peer_device,
const char *direction, struct bm_xfer_ctx *c) const char *direction, struct bm_xfer_ctx *c)
{ {
/* what would it take to transfer it "plaintext" */ /* what would it take to transfer it "plaintext" */
unsigned int header_size = drbd_header_size(first_peer_device(device)->connection); unsigned int header_size = drbd_header_size(peer_device->connection);
unsigned int data_size = DRBD_SOCKET_BUFFER_SIZE - header_size; unsigned int data_size = DRBD_SOCKET_BUFFER_SIZE - header_size;
unsigned int plain = unsigned int plain =
header_size * (DIV_ROUND_UP(c->bm_words, data_size) + 1) + header_size * (DIV_ROUND_UP(c->bm_words, data_size) + 1) +
...@@ -4794,7 +4794,7 @@ void INFO_bm_xfer_stats(struct drbd_device *device, ...@@ -4794,7 +4794,7 @@ void INFO_bm_xfer_stats(struct drbd_device *device,
r = 1000; r = 1000;
r = 1000 - r; r = 1000 - r;
drbd_info(device, "%s bitmap stats [Bytes(packets)]: plain %u(%u), RLE %u(%u), " drbd_info(peer_device, "%s bitmap stats [Bytes(packets)]: plain %u(%u), RLE %u(%u), "
"total %u; compression: %u.%u%%\n", "total %u; compression: %u.%u%%\n",
direction, direction,
c->bytes[1], c->packets[1], c->bytes[1], c->packets[1],
...@@ -4872,7 +4872,7 @@ static int receive_bitmap(struct drbd_connection *connection, struct packet_info ...@@ -4872,7 +4872,7 @@ static int receive_bitmap(struct drbd_connection *connection, struct packet_info
goto out; goto out;
} }
INFO_bm_xfer_stats(device, "receive", &c); INFO_bm_xfer_stats(peer_device, "receive", &c);
if (device->state.conn == C_WF_BITMAP_T) { if (device->state.conn == C_WF_BITMAP_T) {
enum drbd_state_rv rv; enum drbd_state_rv rv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment