lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 318/879] drbd: use bdev based limit helpers in drbd_send_sizes
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 7a38acce229685968b770d1d9e64e01396b93643 ]

    Use the bdev based limits helpers where they exist.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
    Link: https://lore.kernel.org/r/20220415045258.199825-6-hch@lst.de
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/block/drbd/drbd_main.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
    index 367715205c86..c39b04bda261 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,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 {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:37    [W:2.090 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site