linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Jinyoung Choi <j-young.choi@samsung.com>, linux-block@vger.kernel.org
Subject: [PATCH 6/8] block: downgrade a bio_full call in bio_add_page
Date: Mon, 24 Jul 2023 09:54:31 -0700	[thread overview]
Message-ID: <20230724165433.117645-7-hch@lst.de> (raw)
In-Reply-To: <20230724165433.117645-1-hch@lst.de>

bio_add_page already checks that there is space in bi_size a little
earlier.  So after we failed to add to an existing segment, just check
that there is another one available instead of duplicating the bi_size
check.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jinyoung Choi <j-young.choi@samsung.com>
---
 block/bio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/bio.c b/block/bio.c
index 17f57fd2cff2f1..d8e0e8de8cf4f6 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1126,7 +1126,7 @@ int bio_add_page(struct bio *bio, struct page *page,
 	    __bio_try_merge_page(bio, page, len, offset, &same_page))
 		return len;
 
-	if (bio_full(bio, len))
+	if (bio->bi_vcnt >= bio->bi_max_vecs)
 		return 0;
 	__bio_add_page(bio, page, len, offset);
 	return len;
-- 
2.39.2


  parent reply	other threads:[~2023-07-24 16:54 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-24 16:54 rationalize the flow in bio_add_page and friends v2 Christoph Hellwig
2023-07-24 16:54 ` [PATCH 1/8] block: tidy up the bio full checks in bio_add_hw_page Christoph Hellwig
2023-07-25  1:41   ` Jinyoung Choi
2023-07-24 16:54 ` [PATCH 2/8] block: use SECTOR_SHIFT bio_add_hw_page Christoph Hellwig
2023-07-24 16:54 ` [PATCH 3/8] block: move the BIO_CLONED checks out of __bio_try_merge_page Christoph Hellwig
2023-07-24 16:54 ` [PATCH 4/8] block: move the bi_vcnt check " Christoph Hellwig
2023-07-24 16:54 ` [PATCH 5/8] block: move the bi_size overflow check in __bio_try_merge_page Christoph Hellwig
2023-07-24 16:54 ` Christoph Hellwig [this message]
2023-07-24 16:54 ` [PATCH 7/8] block: move the bi_size update out of __bio_try_merge_page Christoph Hellwig
2023-07-24 16:54 ` [PATCH 8/8] block: don't pass a bio to bio_try_merge_hw_seg Christoph Hellwig
2023-07-25  1:55 ` rationalize the flow in bio_add_page and friends v2 Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2023-05-12 13:38 rationalize the flow in bio_add_page and friends Christoph Hellwig
2023-05-12 13:38 ` [PATCH 6/8] block: downgrade a bio_full call in bio_add_page Christoph Hellwig
2023-05-19  6:18   ` Jinyoung CHOI

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=20230724165433.117645-7-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=j-young.choi@samsung.com \
    --cc=linux-block@vger.kernel.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).