From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51C1FC433F5 for ; Sat, 9 Apr 2022 08:17:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6D1D6B0071; Sat, 9 Apr 2022 04:17:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF6A86B0074; Sat, 9 Apr 2022 04:17:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 996DB6B0075; Sat, 9 Apr 2022 04:17:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0180.hostedemail.com [216.40.44.180]) by kanga.kvack.org (Postfix) with ESMTP id 8A37A6B0071 for ; Sat, 9 Apr 2022 04:17:03 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 45D68183ED979 for ; Sat, 9 Apr 2022 08:17:03 +0000 (UTC) X-FDA: 79336635126.24.D2389CD Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by imf27.hostedemail.com (Postfix) with ESMTP id AD9E64000D for ; Sat, 9 Apr 2022 08:17:02 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id s28so128648wrb.5 for ; Sat, 09 Apr 2022 01:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=Ga61vN/TMGQoWv5pdVva9yHEVEk7JvDu8SvkqTkiHOU=; b=16VWXfTcecI6vKD89hlxEi4M1sM+lDWraPFKcdJek4zYvKgcUI+UTTfswq4WTG3pUA DwGdvejVPHmGbB6WxyxpG5RxCDgxrI8ELqeSKx9xnWZSuDqFsfTR7C0q23UBJ4NTUUke 9rs/lGq9PScZMcSAS9SHkk+s8lIoFrVgzxTJ9NRLUES2XsBvbZXGJskPHSy0jdzHruaB iGqoe9YksSt5XleGcAhaVmv2OHki/8AO1/zdgDuyMqAmL6dyveVZDyPGB/rY+7+4UaaK b7o7nIN/SrEk1fy76OtZuySau99YX+Sryl6fYO8t+jUUvribl7KiF9nqytVWelfdH+Mk O4fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=Ga61vN/TMGQoWv5pdVva9yHEVEk7JvDu8SvkqTkiHOU=; b=5kYvfZvmHsdyBTknzoNfXiBYi5hkv5xDniCrkWjrmcc/FGIBAJPTpQkQE4MWhH29GJ SRdd4EKwKuWjtQmdZK/HvhczjYyHdAm4N13xEQ1UQRzoTOHPCddjujefYEPUlFYUwppT 4fRfiW1YWLvCfLxckw7cCkpDzCRW8bE1X49nCR2RWQU5hosYO6L1JqgBcU4Ke90MvVyJ cXima4le7ovCYl+iG39yIKGVLdEHWEls+RbE7HlTYLBvd+Ue20Q283ps7gwOY2cWNwlW L3NEywbmYCiPdGkPoimc3lVpCfJqhTNY7DCgCwX1BgoyBymm6IgfafIaWzF2ZB1PMeHe eo0g== X-Gm-Message-State: AOAM531m4XHgvbqQXEMDkGKYUSnr5TUNUbKQvhWmWUPZ+kFcwXaegfSQ X7reGSS2Tt50RghAv2Jq9TKVeQ== X-Google-Smtp-Source: ABdhPJyMl7hUdRWB67QUv24ZWK8mJRwBaxhnGq09ejE28bU5zjvkHivlidIC/JIf/EdWqVvIZNI6nA== X-Received: by 2002:adf:9581:0:b0:1ed:c341:4ed1 with SMTP id p1-20020adf9581000000b001edc3414ed1mr16998132wrp.299.1649492221449; Sat, 09 Apr 2022 01:17:01 -0700 (PDT) Received: from [192.168.169.127] (178.115.52.210.wireless.dyn.drei.com. [178.115.52.210]) by smtp.gmail.com with ESMTPSA id r14-20020a05600c35ce00b0038c9f469979sm12169802wmq.40.2022.04.09.01.16.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 09 Apr 2022 01:17:01 -0700 (PDT) Message-ID: <5a26cdb1-b63b-8d35-640b-bc0e0f78a181@linbit.com> Date: Sat, 9 Apr 2022 10:16:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Subject: Re: [Drbd-dev] [PATCH 04/27] drbd: remove assign_p_sizes_qlim Content-Language: en-US To: Christoph Hellwig 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 References: <20220409045043.23593-1-hch@lst.de> <20220409045043.23593-5-hch@lst.de> From: =?UTF-8?Q?Christoph_B=c3=b6hmwalder?= In-Reply-To: <20220409045043.23593-5-hch@lst.de> Content-Type: text/plain; charset=UTF-8; format=flowed X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: AD9E64000D X-Stat-Signature: ehpujh7mpqtjszfq489zorxuk7jhtnui X-Rspam-User: Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=16VWXfTc; dmarc=none; spf=pass (imf27.hostedemail.com: domain of christoph.boehmwalder@linbit.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=christoph.boehmwalder@linbit.com X-HE-Tag: 1649492222-309963 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 09.04.22 06:50, Christoph Hellwig wrote: > Fold each branch into its only caller. >=20 > Signed-off-by: Christoph Hellwig > --- > drivers/block/drbd/drbd_main.c | 47 +++++++++++++++------------------= - > 1 file changed, 20 insertions(+), 27 deletions(-) >=20 > diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_m= ain.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) > } > } > =20 > -/* 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 =3D cpu_to_be32(queue_physical_block_si= ze(q)); > - p->qlim->logical_block_size =3D cpu_to_be32(queue_logical_block_size= (q)); > - p->qlim->alignment_offset =3D cpu_to_be32(queue_alignment_offset(q))= ; > - p->qlim->io_min =3D cpu_to_be32(queue_io_min(q)); > - p->qlim->io_opt =3D cpu_to_be32(queue_io_opt(q)); > - p->qlim->discard_enabled =3D blk_queue_discard(q); > - p->qlim->write_same_capable =3D 0; > - } else { > - q =3D device->rq_queue; > - p->qlim->physical_block_size =3D cpu_to_be32(queue_physical_block_si= ze(q)); > - p->qlim->logical_block_size =3D cpu_to_be32(queue_logical_block_size= (q)); > - p->qlim->alignment_offset =3D 0; > - p->qlim->io_min =3D cpu_to_be32(queue_io_min(q)); > - p->qlim->io_opt =3D cpu_to_be32(queue_io_opt(q)); > - p->qlim->discard_enabled =3D 0; > - p->qlim->write_same_capable =3D 0; > - } > -} > - > int drbd_send_sizes(struct drbd_peer_device *peer_device, int trigger= _reply, enum dds_flags flags) > { > struct drbd_device *device =3D peer_device->device; > @@ -957,14 +932,32 @@ int drbd_send_sizes(struct drbd_peer_device *peer= _device, int trigger_reply, enu > q_order_type =3D drbd_queue_order_type(device); > max_bio_size =3D queue_max_hw_sectors(q) << 9; > max_bio_size =3D min(max_bio_size, DRBD_MAX_BIO_SIZE); > - assign_p_sizes_qlim(device, p, q); > + p->qlim->physical_block_size =3D > + cpu_to_be32(queue_physical_block_size(q)); > + p->qlim->logical_block_size =3D > + cpu_to_be32(queue_logical_block_size(q)); > + p->qlim->alignment_offset =3D > + cpu_to_be32(queue_alignment_offset(q)); > + p->qlim->io_min =3D cpu_to_be32(queue_io_min(q)); > + p->qlim->io_opt =3D cpu_to_be32(queue_io_opt(q)); > + p->qlim->discard_enabled =3D blk_queue_discard(q); > put_ldev(device); > } else { > + struct request_queue *q =3D device->rq_queue; > + > + p->qlim->physical_block_size =3D > + cpu_to_be32(queue_physical_block_size(q)); > + p->qlim->logical_block_size =3D > + cpu_to_be32(queue_logical_block_size(q)); > + p->qlim->alignment_offset =3D 0; > + p->qlim->io_min =3D cpu_to_be32(queue_io_min(q)); > + p->qlim->io_opt =3D cpu_to_be32(queue_io_opt(q)); > + p->qlim->discard_enabled =3D 0; > + > d_size =3D 0; > u_size =3D 0; > q_order_type =3D QUEUE_ORDERED_NONE; > max_bio_size =3D DRBD_MAX_BIO_SIZE; /* ... multiple BIOs per peer_r= equest */ > - assign_p_sizes_qlim(device, p, NULL); > } > =20 > if (peer_device->connection->agreed_pro_version <=3D 94) LGTM now, thanks. Acked-by: Christoph B=C3=B6hmwalder