[Drbd-dev] [PATCH 05/27] drbd: use bdev based limit helpers in drbd_send_sizes

[Christoph Böhmwalder]

Am 06.04.22 um 08:04 schrieb Christoph Hellwig:
> Use the bdev based limits helpers where they exist.
> 
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
>  drivers/block/drbd/drbd_main.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 74b1b2424efff..d20d84ee7a88e 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -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,16 +935,15 @@ 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);
> -		p->qlim->write_same_capable =
> -			!!q->limits.max_write_same_sectors;
> +		p->qlim->write_same_capable = 0;
>  		put_ldev(device);
>  	} else {
>  		struct request_queue *q = device->rq_queue;

Acked-by: Christoph Böhmwalder <christoph.boehmwalder at linbit.com>