From patchwork Thu Mar 30 10:43:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 13193861 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 83E08C761A6 for ; Thu, 30 Mar 2023 10:44:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0709F900003; Thu, 30 Mar 2023 06:44:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 020A3900002; Thu, 30 Mar 2023 06:44:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDD07900003; Thu, 30 Mar 2023 06:44:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CF324900002 for ; Thu, 30 Mar 2023 06:44:15 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8E68C120882 for ; Thu, 30 Mar 2023 10:44:15 +0000 (UTC) X-FDA: 80625230070.25.80B15AC Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) by imf24.hostedemail.com (Postfix) with ESMTP id 711AE18000D for ; Thu, 30 Mar 2023 10:44:13 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=q5fWOifU; spf=pass (imf24.hostedemail.com: domain of "prvs=446327cdf=johannes.thumshirn@wdc.com" designates 216.71.153.141 as permitted sender) smtp.mailfrom="prvs=446327cdf=johannes.thumshirn@wdc.com"; dmarc=pass (policy=quarantine) header.from=wdc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680173053; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Qg/Z4HsvCeaPa6Cba5WAwCsrSCFAhIpWvpzK/p/YtJo=; b=t6ue2M0uTH0tA6QOwv8AFEgU+ecAIKoDV/ghOxA0X1XAd2YmvfB8J6sXxiCcvsTo39f1oR X+doHNa8YYOvQLWFoGOFx6Ipc2X13VA3uSUzZ9tL57QSOMKdCgCrspyQhExwjvKGQilYWU wvsU9k+5jcf30EoMJoj99/PXJDFuHfc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=q5fWOifU; spf=pass (imf24.hostedemail.com: domain of "prvs=446327cdf=johannes.thumshirn@wdc.com" designates 216.71.153.141 as permitted sender) smtp.mailfrom="prvs=446327cdf=johannes.thumshirn@wdc.com"; dmarc=pass (policy=quarantine) header.from=wdc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680173053; a=rsa-sha256; cv=none; b=Cz/Cp4Ze6lmF4oZrXaO+JAXpPT3Nq7O5yhca4UF1zm9XL0uoryfQolcS6+XSzY1MxjG30Q yxeomKpn2lHoIURf2G3gxHtKhaH6GLuJon8Lq5QL41IFOv/dttQtG9x3aiZ1balRI0KMzY yx01hzdJQlyvyXDMafRG4IP8wboq+4Y= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1680173053; x=1711709053; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=L3cfRA2wikfkIsf3C8GxTLr6ByhKgTx7ps7OwYMzkj4=; b=q5fWOifUX2EhOfNPlDP8n3Mrngs8gQRKuZqgb0GYUIbdczF4nikjSSsE L/YO2Jan1SCJ8XgMbNvD3leun4QRhfL7PoEAzcE+AvsHtzd7citbUuR/u m1yCQ+ZN8GdtA+D5eWV4bLjJqYBjqBuJBi18bimpqx4hphr3sK01UuCT9 HRsJYKkJsc7rxihMbOYinPka6/8a2VlwsJpuKgKoKVLfKrf7378hXS1X+ VzGFW2b9ZP4dAbgPFbYnCJ+vhyhqJCrK7s1xhlK44gBgQT7mCVwvoq8ka b/t/qLWm9IhBgx5UsysJ3bCD86XSuagD/low8DQYPyYM9Yuc8WYp+08D2 g==; X-IronPort-AV: E=Sophos;i="5.98,303,1673884800"; d="scan'208";a="231853891" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2023 18:44:12 +0800 IronPort-SDR: z7173R0lwoZZWU5jPBTQ8PqQ1menm8WwP9B8wx2bSxZzh/hewV3cMYWwdegZcHijI7TrW1d8sO MC2BlUCYoa5hpFSDML9jknz7Zb+LqOhfARVlGIJ+4Z7Ew2lNosmbw+ecScZv051Ij5MNX58f4Z 8z9bys6OwshuM0s1VTlRsYGPOFPjn2xNRu1RREg6pI5XZu/I8+CvHIjCfJ/fpWUhMhwtktIh7B rmXIOex9AOgB475VcKhBK4m8zXjgbnGPiHIkLWZ6UwvbCWu3YoZld8w5BAFMBDc7w2fbviMyav RG8= Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 30 Mar 2023 02:54:39 -0700 IronPort-SDR: RehRzaThR0hc37wNjqkltJ+dfO/hlRGJetFrnAX1UOANVz9k5ZIJ+kSDt8opKJGJOwIrFyEeZk TwtDv9Huypg0wYz4dm/8NDnvwLaqh3eVfRvAkWkT6VvIVHouxmJ9cojW5aiBrZ2cuUyar8GmxH pM7pZBufBx/ouszcaAOPMBaDxfOwlbo6DAOIZUQEsZdRgiXOJyXcbpTXXM52G8GbwuePmG9tD7 6CT3hnKgyfR15tAPquXFKRiXeuWuTEb6OxiN0Sdo2XMa4aDdkQ/G6vt9d7MC/I6z4RZ/z+UW9i T4A= WDCIronportException: Internal Received: from unknown (HELO redsun91.ssa.fujisawa.hgst.com) ([10.149.66.72]) by uls-op-cesaip01.wdc.com with ESMTP; 30 Mar 2023 03:44:09 -0700 From: Johannes Thumshirn To: Jens Axboe Cc: Christoph Hellwig , Hannes Reinecke , Chaitanya Kulkarni , Damien Le Moal , Ming Lei , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, dm-devel@redhat.com, Song Liu , linux-raid@vger.kernel.org, Mike Snitzer , Matthew Wilcox , Dave Kleikamp , jfs-discussion@lists.sourceforge.net, cluster-devel@redhat.com, Bob Peterson , Andreas Gruenbacher , David Sterba , linux-btrfs@vger.kernel.org, Johannes Thumshirn , Damien Le Moal Subject: [PATCH v2 02/19] drbd: use __bio_add_page to add page to bio Date: Thu, 30 Mar 2023 03:43:44 -0700 Message-Id: <01716d15d92c2dc01607b0491199d7a4ad3fced9.1680172791.git.johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 711AE18000D X-Stat-Signature: piwmcd3f6pzt4tiqarkgjsadswp6gctn X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1680173053-987612 X-HE-Meta: U2FsdGVkX19B39wLruuET8IHtLbxbdJVTMnxeSUUDT5zsFJpYk1/FRkB7E7LjYJ1bXQf0bgNUYPimqO6oth3OCHs3L0QgJ7ohnK563p/MA4LdJFXwMFCgpB0NohYx9CVNLEQxkS3lBULMkJ6hY1PlzuygwNzyiA+dfejCFb+ip+fvsIaNc+WV3zCNB6tYGDQ3D2iZVcbxMUbB7RxBIju9veGkUQIWK5XImaYDCeqdlVPuJg+e+8uX1Jy8QbhJMTFt68X8VBRNPm8c2yeilrTi3YoiSiKJgpC7qrsaYmQwv4ye2umIaEv+Jtu5YlwkC9NBPWs0yTTcSt5WKiSy9nZtwxmcoEZ4n4qnzPuElz5qdZ3eTUXNGpTwA9zAn0DUsaMeLf51s3MHnlGJUIq36lV8BVqep2lvtySsx/yGbxa63U/gff7hrxbwbpVtsDf4pCILTaSHVewufyieasLHnULKT9aqETpbmHfLT310aV5TNEA6Zfw1q/7E2UCk6HTMsILwi6M6USyZhqi7+eeN/V4nqT2jJmriXYU3aZyT/zYRwt7E/iua1K2leJvl4OwmIxQ/rjXtEJOk+VbUeDK/TCV4/lA6m6vfjkZ05YJXmR+zrg0YBAvXE1KxwSPtyQLIpRqFPk3dIG4qJH1tCjafot2cSy5iNWGiH8qiHZZMe0l/SFnfhoF0yspmcLdGHapzAlxuyKKxTvGlmDBf/3UVk27lSwJQvO6FJdfViPm6oSCcaHfUQO94hXR0NNinwCm9jy8WlklJFO0wP4/BJBnRH/fJ9fBRJuIZV2HQiy4TFIuWON2p2xcGOteaEZCTUHQXF4Uf4+rYVn6F4uuyT/k2FLIhvyPZNfG2SlSsCYZ+t13PMWwL7Hm+HkEnNPkETWUna4Utm8v4KPffUW6Bf5CFHjAFM/gZarsbjykr6aIEEmmiavu4d5iHXdP08T+Ogs41cfMvNJe38CV2N4hCU4Dqf3 uEqbZWtX /v5ujyhOyPgW9QHUmHTT7l/hU8umHemKxQwjivcLVRh/TFiw/pwTQQQOMpfT2L10kv3uYzfMXTSIL/accsImQQOlnjASwPn2vHF1MqpvDzpEJdVNDz23VrOCOSH+tL2iMU+abpsdemMtIkopKHpksg51wVB96vgto5vFIOwP/ZW7wfgOJ1O5DoK0TlqQdgGhe5z3PwRHmscqO44ZfN8r6phLLxK5YeKZG+0nfH3vBJqAilzLwNc51PJtxrwvrjsLVhCsr9FfKErsW+jnmA1Ihdtvpc0isC9cTLgWf5VaVijLWgDZxv+T5WD2R7AFdqZF8Wwzhhclw71sfSmIe4tDMpLEt0q7Ok84XDCyecf9vSA7RIdPkmId6+eQSdZl4nvP/sgYJY3xDHliVeP15pEuayxDBs9PLJ3otmm7O 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: The drbd code only adds a single page to a newly created bio. So use __bio_add_page() to add the page which is guaranteed to succeed in this case. This brings us closer to marking bio_add_page() as __must_check. Signed-off-by: Johannes Thumshirn Reviewed-by: Damien Le Moal --- drivers/block/drbd/drbd_bitmap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 289876ffbc31..050154eb963d 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -1043,9 +1043,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho bio = bio_alloc_bioset(device->ldev->md_bdev, 1, op, GFP_NOIO, &drbd_md_io_bio_set); bio->bi_iter.bi_sector = on_disk_sector; - /* bio_add_page of a single page to an empty bio will always succeed, - * according to api. Do we want to assert that? */ - bio_add_page(bio, page, len, 0); + __bio_add_page(bio, page, len, 0); bio->bi_private = ctx; bio->bi_end_io = drbd_bm_endio;