]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drbd: use bdev_alignment_offset instead of queue_alignment_offset
authorChristoph Hellwig <hch@lst.de>
Fri, 15 Apr 2022 04:52:37 +0000 (06:52 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Apr 2022 01:49:58 +0000 (19:49 -0600)
The bdev version does the right thing for partitions, so use that.

Fixes: 59b041665fa0 ("drbd: introduce WRITE_SAME support")
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-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/drbd/drbd_main.c

index c39b04bda261fb78d893432bf9f75752852169ba..7b501c8d59928d0c4540da47c5dcfb32a5dfa7e7 100644 (file)
@@ -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);