Commit 7a38acce authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

drbd: use bdev based limit helpers in drbd_send_sizes 



Use the bdev based limits helpers where they exist.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20220415045258.199825-6-hch@lst.de


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

drivers/block/drbd/drbd_main.c

+7 −5
Original line number Diff line number Diff line
@@ -924,7 +924,9 @@ int drbd_send_sizes(struct drbd_peer_device *peer_device, int trigger_reply, enu 


	memset(p, 0, packet_size);

	if (get_ldev_if_state(device, D_NEGOTIATING)) {

		struct request_queue *q = bdev_get_queue(device->ldev->backing_bdev);

		struct block_device *bdev = device->ldev->backing_bdev;

		struct request_queue *q = bdev_get_queue(bdev);



		d_size = drbd_get_max_capacity(device->ldev);

		rcu_read_lock();

		u_size = rcu_dereference(device->ldev->disk_conf)->disk_size;
@@ -933,13 +935,13 @@ int drbd_send_sizes(struct drbd_peer_device *peer_device, int trigger_reply, enu 
		max_bio_size = queue_max_hw_sectors(q) << 9;

		max_bio_size = min(max_bio_size, DRBD_MAX_BIO_SIZE);

		p->qlim->physical_block_size =

			cpu_to_be32(queue_physical_block_size(q));

			cpu_to_be32(bdev_physical_block_size(bdev));

		p->qlim->logical_block_size =

			cpu_to_be32(queue_logical_block_size(q));

			cpu_to_be32(bdev_logical_block_size(bdev));

		p->qlim->alignment_offset =

			cpu_to_be32(queue_alignment_offset(q));

		p->qlim->io_min = cpu_to_be32(queue_io_min(q));

		p->qlim->io_opt = cpu_to_be32(queue_io_opt(q));

		p->qlim->io_min = cpu_to_be32(bdev_io_min(bdev));

		p->qlim->io_opt = cpu_to_be32(bdev_io_opt(bdev));

		p->qlim->discard_enabled = blk_queue_discard(q);

		put_ldev(device);

	} else {