From: Christoph Hellwig Date: Fri, 15 Apr 2022 04:52:37 +0000 (+0200) Subject: drbd: use bdev_alignment_offset instead of queue_alignment_offset X-Git-Tag: v6.6.17~7352^2~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6f23b1a05441a26f765e59dd95e8ba7354f9388;p=platform%2Fkernel%2Flinux-rpi.git drbd: use bdev_alignment_offset instead of queue_alignment_offset The bdev version does the right thing for partitions, so use that. Fixes: 9104d31a759f ("drbd: introduce WRITE_SAME support") Signed-off-by: Christoph Hellwig Acked-by: Christoph Böhmwalder Link: https://lore.kernel.org/r/20220415045258.199825-7-hch@lst.de Signed-off-by: Jens Axboe --- diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index c39b04bda261..7b501c8d5992 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -939,7 +939,7 @@ int drbd_send_sizes(struct drbd_peer_device *peer_device, int trigger_reply, enu p->qlim->logical_block_size = cpu_to_be32(bdev_logical_block_size(bdev)); p->qlim->alignment_offset = - cpu_to_be32(queue_alignment_offset(q)); + cpu_to_be32(bdev_alignment_offset(bdev)); 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);