From: "Christoph Böhmwalder" <christoph.boehmwalder@linbit.com>
To: Christoph Hellwig <hch@lst.de>
Cc: jfs-discussion@lists.sourceforge.net,
linux-nvme@lists.infradead.org,
virtualization@lists.linux-foundation.org, linux-mm@kvack.org,
dm-devel@redhat.com, target-devel@vger.kernel.org,
linux-mtd@lists.infradead.org, drbd-dev@lists.linbit.com,
linux-s390@vger.kernel.org, linux-nilfs@vger.kernel.org,
linux-scsi@vger.kernel.org, cluster-devel@redhat.com,
xen-devel@lists.xenproject.org, linux-ext4@vger.kernel.org,
linux-um@lists.infradead.org, nbd@other.debian.org,
linux-block@vger.kernel.org, linux-bcache@vger.kernel.org,
ceph-devel@vger.kernel.org, linux-raid@vger.kernel.org,
linux-mmc@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-xfs@vger.kernel.org, ocfs2-devel@oss.oracle.com,
linux-fsdevel@vger.kernel.org, ntfs3@lists.linux.dev,
linux-btrfs@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Subject: Re: [Drbd-dev] [PATCH 04/27] drbd: remove assign_p_sizes_qlim
Date: Sat, 9 Apr 2022 10:16:58 +0200 [thread overview]
Message-ID: <5a26cdb1-b63b-8d35-640b-bc0e0f78a181@linbit.com> (raw)
In-Reply-To: <20220409045043.23593-5-hch@lst.de>
On 09.04.22 06:50, Christoph Hellwig wrote:
> Fold each branch into its only caller.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/block/drbd/drbd_main.c | 47 +++++++++++++++-------------------
> 1 file changed, 20 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 9676a1d214bc5..1262fe1c33618 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -903,31 +903,6 @@ void drbd_gen_and_send_sync_uuid(struct drbd_peer_device *peer_device)
> }
> }
>
> -/* communicated if (agreed_features & DRBD_FF_WSAME) */
> -static void
> -assign_p_sizes_qlim(struct drbd_device *device, struct p_sizes *p,
> - struct request_queue *q)
> -{
> - if (q) {
> - p->qlim->physical_block_size = cpu_to_be32(queue_physical_block_size(q));
> - p->qlim->logical_block_size = cpu_to_be32(queue_logical_block_size(q));
> - 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->discard_enabled = blk_queue_discard(q);
> - p->qlim->write_same_capable = 0;
> - } else {
> - q = device->rq_queue;
> - p->qlim->physical_block_size = cpu_to_be32(queue_physical_block_size(q));
> - p->qlim->logical_block_size = cpu_to_be32(queue_logical_block_size(q));
> - p->qlim->alignment_offset = 0;
> - p->qlim->io_min = cpu_to_be32(queue_io_min(q));
> - p->qlim->io_opt = cpu_to_be32(queue_io_opt(q));
> - p->qlim->discard_enabled = 0;
> - p->qlim->write_same_capable = 0;
> - }
> -}
> -
> int drbd_send_sizes(struct drbd_peer_device *peer_device, int trigger_reply, enum dds_flags flags)
> {
> struct drbd_device *device = peer_device->device;
> @@ -957,14 +932,32 @@ int drbd_send_sizes(struct drbd_peer_device *peer_device, int trigger_reply, enu
> q_order_type = drbd_queue_order_type(device);
> max_bio_size = queue_max_hw_sectors(q) << 9;
> max_bio_size = min(max_bio_size, DRBD_MAX_BIO_SIZE);
> - assign_p_sizes_qlim(device, p, q);
> + p->qlim->physical_block_size =
> + cpu_to_be32(queue_physical_block_size(q));
> + p->qlim->logical_block_size =
> + cpu_to_be32(queue_logical_block_size(q));
> + 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->discard_enabled = blk_queue_discard(q);
> put_ldev(device);
> } else {
> + struct request_queue *q = device->rq_queue;
> +
> + p->qlim->physical_block_size =
> + cpu_to_be32(queue_physical_block_size(q));
> + p->qlim->logical_block_size =
> + cpu_to_be32(queue_logical_block_size(q));
> + p->qlim->alignment_offset = 0;
> + p->qlim->io_min = cpu_to_be32(queue_io_min(q));
> + p->qlim->io_opt = cpu_to_be32(queue_io_opt(q));
> + p->qlim->discard_enabled = 0;
> +
> d_size = 0;
> u_size = 0;
> q_order_type = QUEUE_ORDERED_NONE;
> max_bio_size = DRBD_MAX_BIO_SIZE; /* ... multiple BIOs per peer_request */
> - assign_p_sizes_qlim(device, p, NULL);
> }
>
> if (peer_device->connection->agreed_pro_version <= 94)
LGTM now, thanks.
Acked-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
next prev parent reply other threads:[~2022-04-09 8:17 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 4:50 use block_device based APIs in block layer consumers v2 Christoph Hellwig
2022-04-09 4:50 ` [PATCH 01/27] target: remove an incorrect unmap zeroes data deduction Christoph Hellwig
2022-04-09 4:50 ` [PATCH 02/27] target: pass a block_device to target_configure_unmap_from_queue Christoph Hellwig
2022-04-09 4:50 ` [PATCH 03/27] target: fix discard alignment on partitions Christoph Hellwig
2022-04-09 4:50 ` [PATCH 04/27] drbd: remove assign_p_sizes_qlim Christoph Hellwig
2022-04-09 8:16 ` Christoph Böhmwalder [this message]
2022-04-09 4:50 ` [PATCH 05/27] drbd: use bdev based limit helpers in drbd_send_sizes Christoph Hellwig
2022-04-09 4:50 ` [PATCH 06/27] drbd: use bdev_alignment_offset instead of queue_alignment_offset Christoph Hellwig
2022-04-09 4:50 ` [PATCH 07/27] drbd: cleanup decide_on_discard_support Christoph Hellwig
2022-04-09 4:50 ` [PATCH 08/27] btrfs: use bdev_max_active_zones instead of open coding it Christoph Hellwig
2022-04-11 17:22 ` David Sterba
2022-04-09 4:50 ` [PATCH 09/27] ntfs3: use bdev_logical_block_size " Christoph Hellwig
2022-04-09 4:50 ` [PATCH 10/27] mm: use bdev_is_zoned in claim_swapfile Christoph Hellwig
2022-04-09 4:50 ` [PATCH 11/27] block: add a bdev_nonrot helper Christoph Hellwig
2022-04-09 4:50 ` [PATCH 12/27] block: add a bdev_write_cache helper Christoph Hellwig
2022-04-09 4:50 ` [PATCH 13/27] block: add a bdev_fua helper Christoph Hellwig
2022-04-09 4:50 ` [PATCH 14/27] block: add a bdev_stable_writes helper Christoph Hellwig
2022-04-09 4:50 ` [PATCH 15/27] block: add a bdev_max_zone_append_sectors helper Christoph Hellwig
2022-04-09 4:50 ` [PATCH 16/27] block: use bdev_alignment_offset in part_alignment_offset_show Christoph Hellwig
2022-04-09 4:50 ` [PATCH 17/27] block: use bdev_alignment_offset in disk_alignment_offset_show Christoph Hellwig
2022-04-09 4:50 ` [PATCH 18/27] block: move bdev_alignment_offset and queue_limit_alignment_offset out of line Christoph Hellwig
2022-04-09 4:50 ` [PATCH 19/27] block: remove queue_discard_alignment Christoph Hellwig
2022-04-09 4:50 ` [PATCH 20/27] block: use bdev_discard_alignment in part_discard_alignment_show Christoph Hellwig
2022-04-09 4:50 ` [PATCH 21/27] block: move {bdev,queue_limit}_discard_alignment out of line Christoph Hellwig
2022-04-09 4:50 ` [PATCH 22/27] block: refactor discard bio size limiting Christoph Hellwig
2022-04-09 4:50 ` [PATCH 23/27] block: add a bdev_max_discard_sectors helper Christoph Hellwig
2022-04-09 4:50 ` [PATCH 24/27] block: remove QUEUE_FLAG_DISCARD Christoph Hellwig
2022-04-09 8:15 ` Christoph Böhmwalder
2022-04-10 6:26 ` Christoph Hellwig
2022-04-11 12:03 ` Jan Höppner
2022-04-11 14:01 ` Keith Busch
2022-04-11 17:24 ` David Sterba
2022-04-09 4:50 ` [PATCH 25/27] block: add a bdev_discard_granularity helper Christoph Hellwig
2022-04-11 17:25 ` David Sterba
2022-04-09 4:50 ` [PATCH 26/27] block: decouple REQ_OP_SECURE_ERASE from REQ_OP_DISCARD Christoph Hellwig
2022-04-09 14:32 ` Coly Li
2022-04-10 6:27 ` Christoph Hellwig
2022-04-09 4:50 ` [PATCH 27/27] direct-io: remove random prefetches Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5a26cdb1-b63b-8d35-640b-bc0e0f78a181@linbit.com \
--to=christoph.boehmwalder@linbit.com \
--cc=axboe@kernel.dk \
--cc=ceph-devel@vger.kernel.org \
--cc=cluster-devel@redhat.com \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=hch@lst.de \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nbd@other.debian.org \
--cc=ntfs3@lists.linux.dev \
--cc=ocfs2-devel@oss.oracle.com \
--cc=target-devel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).