Commit 5e54c2a6 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe
Browse files

drbd: INFO_bm_xfer_stats(): Pass a peer device argument 



Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20230330102744.2128122-2-christoph.boehmwalder@linbit.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8164dd6c

drivers/block/drbd/drbd_int.h

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct bm_xfer_ctx { 
	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);



static inline void bm_xfer_ctx_bit_to_word_offset(struct bm_xfer_ctx *c)

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ send_bitmap_rle_or_plain(struct drbd_peer_device *peer_device, struct bm_xfer_ct 
	}

	if (!err) {

		if (len == 0) {

			INFO_bm_xfer_stats(device, "send", c);

			INFO_bm_xfer_stats(peer_device, "send", c);

			return 0;

		} else

			return 1;

drivers/block/drbd/drbd_receiver.c

+4 −4
Original line number Diff line number Diff line
@@ -4766,11 +4766,11 @@ decode_bitmap_c(struct drbd_peer_device *peer_device, 
	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)

{

	/* 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 plain =

		header_size * (DIV_ROUND_UP(c->bm_words, data_size) + 1) +
@@ -4794,7 +4794,7 @@ void INFO_bm_xfer_stats(struct drbd_device *device, 
		r = 1000;



	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",

			direction,

			c->bytes[1], c->packets[1],
@@ -4872,7 +4872,7 @@ static int receive_bitmap(struct drbd_connection *connection, struct packet_info 
			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) {

		enum drbd_state_rv rv;