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 1A16CC77B7C for ; Wed, 31 May 2023 11:39:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A9EE8E0003; Wed, 31 May 2023 07:39:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 030578E0002; Wed, 31 May 2023 07:39:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9F3D8E0003; Wed, 31 May 2023 07:39:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BC4F08E0002 for ; Wed, 31 May 2023 07:39:08 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 64281120377 for ; Wed, 31 May 2023 11:39:08 +0000 (UTC) X-FDA: 80850353976.17.D1E4E3A Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 4E3A3160010 for ; Wed, 31 May 2023 11:39:06 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=VFUgMLg6; dmarc=pass (policy=quarantine) header.from=wdc.com; spf=pass (imf08.hostedemail.com: domain of "prvs=508ef2a02=johannes.thumshirn@wdc.com" designates 68.232.143.124 as permitted sender) smtp.mailfrom="prvs=508ef2a02=johannes.thumshirn@wdc.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685533146; 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=eIMNShzbX4d+fuJlDQGVddQb83DiGokEGK2iaexvnMI=; b=uf5aOJF6NcyJPMXB7XVxo9F52cQf+V0jHDbA4SCorSHTGqFvv2ZE3OMm7FPPfT5zOl3fLt G/8H3xUTtK/6FI8YxiETqC1+AZvKdvYccli5CXRFgL/a3JshlIFTOwMqybMuGjkPHfHnKb EWokf1JY6Xvy/XEuE4uax6k4CcX8g4Y= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=VFUgMLg6; dmarc=pass (policy=quarantine) header.from=wdc.com; spf=pass (imf08.hostedemail.com: domain of "prvs=508ef2a02=johannes.thumshirn@wdc.com" designates 68.232.143.124 as permitted sender) smtp.mailfrom="prvs=508ef2a02=johannes.thumshirn@wdc.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685533146; a=rsa-sha256; cv=none; b=tDD+krJGlcJf/SwqwjbTBsFY/9OZWpYMX/65azIWgjr5pn4zAT1ora8ywyLpwI5XO4BA5C Zf62o4Dp7ZeWCtMtL680cVP/YrpBsnxdHmzndAdL5Czr9jaK3Z1gj0Oc0QmMhJbSphQ1ey Vl8LBRFPfLkfRqkCWApAozhCq/6IRRc= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1685533146; x=1717069146; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mcd/H07yjDNLd/X+ei4F/kInbJgAqWy0dojDfw1QWYw=; b=VFUgMLg6uM5+L/Xda+KVO3vDt3sK+YCdHLyzEqDmQfzvm9SU20verpBP DmtvF2pQC1Z2d9D70408anTBNVvSYq8m5CAVmklM6uIRIuTreaAVWIK2m pM0P6YkIhnLDGlxGRqeXrmPMM9tH2oHEs/jlE+ieioDS8PFaEU7De/sfM 9tZMwi2iDJEzpagKzioMMT5WRD+4Y4Xq5sA8jPy9/MfnExlbJkCVAVaXy 8hg6CYaDyEcj4iqYSOaBDpx+/VlBL7ZyrmWAmUNF99BnwVTUle+N3v0aa CJzNuWan/ywPdaENMAmFq5uSTSXFRxsQ1KN5fZ131R0a+j3KH1CeJjg2Z w==; X-IronPort-AV: E=Sophos;i="6.00,207,1681142400"; d="scan'208";a="336547348" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 31 May 2023 19:39:05 +0800 IronPort-SDR: aB+hOYLmOEaQ6hVRqwQpWEk0oJmxDhYV36vSCQR44XICnCN8Fw3UrQQtdTTYa5B84TevgiAXsS 6cti3RsjM2ydZQNGUA3uqZ2C3CJQ+kXoHVnIxaqa3lOXz/Jn5hHmH6MxZ/xQ58hLs+8KIyMFnv OvkPCElxYZ+OtAGbLMkVPbQM+S2tQfPgNdPyeA4EDitjuWCR2FlbGUXkMJfx8GVSZ7QI1cP7qt OcZuHTJLCtUJkDmKSGwAZStPgX2qgihotiaxg3vb/6GgFFa715eyD/QKLDJGFtHRL8dQxDDXq7 Rvo= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 31 May 2023 03:53:57 -0700 IronPort-SDR: dJb/CRSP3Swr2x2jiC+paW0dnGjzm6Bz1GAlGKlca4A7q/x/ky8HuVCu7AA6VYX5uJ0Ewh5t3x q+iWl5HlhzQMV3D+zIls3XMo7zp44uRPShf3qZmHTVjlHtCyJhoy3EfEEf+h9hvbiHfRi/SZaM d9U7RaXciqVsSQr8sZoG/qgLo3wszKIv+4kHv8jpR5BKyb+/H8r/7FEY1iK6JWuO591/DsqLKl X5ltcT6eaJJce6CRG0s8vZd0Q95JNHPvX3nOAbDWSbgMiVFC4dhkCvQP9zoXpp+VrisQgvbaoC Beg= WDCIronportException: Internal Received: from unknown (HELO redsun91.ssa.fujisawa.hgst.com) ([10.149.66.6]) by uls-op-cesaip02.wdc.com with ESMTP; 31 May 2023 04:39:02 -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 , Mikulas Patocka , gouha7@uniontech.com, Johannes Thumshirn Subject: [PATCH v6 19/20] fs: iomap: use __bio_add_folio where possible Date: Wed, 31 May 2023 04:38:01 -0700 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4E3A3160010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: s9rg6ic6qrrd7oq75f99sxmaxwh6bg4r X-HE-Tag: 1685533146-572880 X-HE-Meta: U2FsdGVkX186yFLb1EpBykcqjorb9oTIBfA4NLXagn4bWe5GJRXHkj+kccIDNZ6NrUldctfZKtY2nb8vAQeqjPs0URBo+VzdVTT/bvkfrqsggv0AIe/uv6nJEzNIbGydG+becYH2oLGrYLaoH3jNZyog81SrKk3YVvpVeOLghyVR+4DrBJAcVXjw/PxZDGWqSEiXukEZAqhuM4XlTffSxGg6Wo/pFh2xo667NzwyNRpTx+xZAc8y9mgIPvYIlJTw/8dHu5UggyuSzwfcjDeTeli6D4C9xlmy3LFq0WEBEKsl132YwXXNlTOhegDEGWJjeaU5tPK5ZFV4Xj0pW7b0CLo0KsQIA9d+VCzv5oTYTxb/VvfF5MjyLZrCmsu15dl+wlApXRx1iZwYLiX8MxrEPq4/OOeOGX2YyBf6KxNRYQ9xAXJh3osFQXAPWYKI93RNKxzkHQC6oxuutVgC5EQ7kLzcim3oMvEYm8wW1n2kcwaUvsBsbugehjViQBEb43Np6hZ+o6VUF9/DE3czjnRLTm8aAqGyQrQjj0gub+ZRNKQ0CJyWLxHsz6TkTjvtCi8Ildp4uh7ZV7sb1PKjVVzU3DmbGU4ywSfG7iwRnmJprhfVGjc+mRQz9PkFP3xg5H5hjx69OAFsTeMugW1Fd765fJV+asf4NNQoOt1jE3Gxy8TPJWcfNfScgdZ1Qs2bQ5HN+99yAw1XZQEVvbMLL+5sQA1DYCE5ZiumDSaNCazxw2iXArefltotw8EPX+zCvQ90EyuQ47uOce3PC7Cps+Qfx4SykZK6N7o3N42vSIpq3kfRb45HB23LrPiSIk85FdNrHcvDb9lpJmgIBHAUtGZtb7xNrp/BTM+nzsf3+z/KH4F9XIB+JEFXVKbmLUny24jE+rRS+QwCuqNG2SiSe3ilB1rrMn2h+3stSAzEx2MXOxQiNhBHHPKG17AT0YqbulUihxlrYVYTS5CAiY0wcTy bd/KygDN RZ3hXlsmwiL9BJumsjo8JYMfhsVlErGfl2r4ENyiCKzkk0pilq29ipxhOEkPZfgSAqH8kQSJQgNL51A3DbK5F/n09AiPXEezUTsDqhP58C5OvZJkPCwE+ahEH8O/WplzRnZvQUD7THeAik5Wa6QvIQyiCi+7RiWIhMTvgThyHR33d1//YKwfrS77N29bTOtDmqPTZ+bmPDorh0WOiKX828//RmYwFum3WrWwEQQ0UDlJuqI2FYlJJiu7ZiL6RR7hcjR6La8h5dua+axJ7Km7+DQMjrwVtnMvf3PDOM2WCjwg/ZtF7LVsq1rTnWIaiTiL2wQXPubUfvaXyJQJlSlS/jghh6Jv9oK+nrCRJl0dw1ZWLIH5LdWIRdnSrqKQyH+9XGvPya7lRDdSeI/Qv+jz9Z608LQ== 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: Message-ID: <20230531113801.oqrRQw9_ZJBj2bneKuRQoPnF-jA9BsQyVPDudu74HWg@z> When the iomap buffered-io code can't add a folio to a bio, it allocates a new bio and adds the folio to that one. This is done using bio_add_folio(), but doesn't check for errors. As adding a folio to a newly created bio can't fail, use the newly introduced __bio_add_folio() function. Signed-off-by: Johannes Thumshirn --- fs/iomap/buffered-io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 063133ec77f4..42c5fc0ad329 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -312,7 +312,7 @@ static loff_t iomap_readpage_iter(const struct iomap_iter *iter, ctx->bio->bi_opf |= REQ_RAHEAD; ctx->bio->bi_iter.bi_sector = sector; ctx->bio->bi_end_io = iomap_read_end_io; - bio_add_folio(ctx->bio, folio, plen, poff); + __bio_add_folio(ctx->bio, folio, plen, poff); } done: @@ -539,7 +539,7 @@ static int iomap_read_folio_sync(loff_t block_start, struct folio *folio, bio_init(&bio, iomap->bdev, &bvec, 1, REQ_OP_READ); bio.bi_iter.bi_sector = iomap_sector(iomap, block_start); - bio_add_folio(&bio, folio, plen, poff); + __bio_add_folio(&bio, folio, plen, poff); return submit_bio_wait(&bio); } @@ -1582,7 +1582,7 @@ iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio, if (!bio_add_folio(wpc->ioend->io_bio, folio, len, poff)) { wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio); - bio_add_folio(wpc->ioend->io_bio, folio, len, poff); + __bio_add_folio(wpc->ioend->io_bio, folio, len, poff); } if (iop) -- 2.40.1