All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Mike Snitzer <snitzer@redhat.com>,
	linux-block@vger.kernel.org, dm-devel@redhat.com
Subject: [PATCH 3/5] block: open code blk_max_size_offset in blk_rq_get_max_sectors
Date: Tue, 12 Oct 2021 18:36:11 +0200	[thread overview]
Message-ID: <20211012163613.994933-4-hch@lst.de> (raw)
In-Reply-To: <20211012163613.994933-1-hch@lst.de>

blk_rq_get_max_sectors always uses q->limits.chunk_sectors as the
chunk_sectors argument, and already checks for max_sectors through the
call to blk_queue_get_max_sectors.  That means much of
blk_max_size_offset is not needed and open coding it simplifies the code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-merge.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 14ce19607cd8a..b3da43160032f 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -595,17 +595,18 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
 						  sector_t offset)
 {
 	struct request_queue *q = rq->q;
+	unsigned int max_sectors;
 
 	if (blk_rq_is_passthrough(rq))
 		return q->limits.max_hw_sectors;
 
-	if (!q->limits.chunk_sectors ||
-	    req_op(rq) == REQ_OP_DISCARD ||
-	    req_op(rq) == REQ_OP_SECURE_ERASE)
-		return blk_queue_get_max_sectors(q, req_op(rq));
-
-	return min(blk_max_size_offset(q, offset, 0),
-			blk_queue_get_max_sectors(q, req_op(rq)));
+	max_sectors = blk_queue_get_max_sectors(q, req_op(rq));
+	if (q->limits.chunk_sectors &&
+	    req_op(rq) != REQ_OP_DISCARD &&
+	    req_op(rq) != REQ_OP_SECURE_ERASE)
+		max_sectors = min(max_sectors,
+			chunk_size_left(offset, q->limits.chunk_sectors));
+	return max_sectors;
 }
 
 static inline int ll_new_hw_segment(struct request *req, struct bio *bio,
-- 
2.30.2


WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, dm-devel@redhat.com,
	Mike Snitzer <snitzer@redhat.com>
Subject: [dm-devel] [PATCH 3/5] block: open code blk_max_size_offset in blk_rq_get_max_sectors
Date: Tue, 12 Oct 2021 18:36:11 +0200	[thread overview]
Message-ID: <20211012163613.994933-4-hch@lst.de> (raw)
In-Reply-To: <20211012163613.994933-1-hch@lst.de>

blk_rq_get_max_sectors always uses q->limits.chunk_sectors as the
chunk_sectors argument, and already checks for max_sectors through the
call to blk_queue_get_max_sectors.  That means much of
blk_max_size_offset is not needed and open coding it simplifies the code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-merge.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 14ce19607cd8a..b3da43160032f 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -595,17 +595,18 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
 						  sector_t offset)
 {
 	struct request_queue *q = rq->q;
+	unsigned int max_sectors;
 
 	if (blk_rq_is_passthrough(rq))
 		return q->limits.max_hw_sectors;
 
-	if (!q->limits.chunk_sectors ||
-	    req_op(rq) == REQ_OP_DISCARD ||
-	    req_op(rq) == REQ_OP_SECURE_ERASE)
-		return blk_queue_get_max_sectors(q, req_op(rq));
-
-	return min(blk_max_size_offset(q, offset, 0),
-			blk_queue_get_max_sectors(q, req_op(rq)));
+	max_sectors = blk_queue_get_max_sectors(q, req_op(rq));
+	if (q->limits.chunk_sectors &&
+	    req_op(rq) != REQ_OP_DISCARD &&
+	    req_op(rq) != REQ_OP_SECURE_ERASE)
+		max_sectors = min(max_sectors,
+			chunk_size_left(offset, q->limits.chunk_sectors));
+	return max_sectors;
 }
 
 static inline int ll_new_hw_segment(struct request *req, struct bio *bio,
-- 
2.30.2

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2021-10-12 16:41 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-12 16:36 simplify I/O size calculation helpers Christoph Hellwig
2021-10-12 16:36 ` [dm-devel] " Christoph Hellwig
2021-10-12 16:36 ` [PATCH 1/5] block: factor out a chunk_size_left helper Christoph Hellwig
2021-10-12 16:36   ` [dm-devel] " Christoph Hellwig
2021-10-12 16:50   ` Bart Van Assche
2021-10-12 16:50     ` Bart Van Assche
2021-10-12 16:36 ` [PATCH 2/5] dm: open code blk_max_size_offset in max_io_len Christoph Hellwig
2021-10-12 16:36   ` [dm-devel] " Christoph Hellwig
2021-10-12 16:36 ` Christoph Hellwig [this message]
2021-10-12 16:36   ` [dm-devel] [PATCH 3/5] block: open code blk_max_size_offset in blk_rq_get_max_sectors Christoph Hellwig
2021-10-12 16:36 ` [PATCH 4/5] block: fold blk_max_size_offset into get_max_io_size Christoph Hellwig
2021-10-12 16:36   ` [dm-devel] " Christoph Hellwig
2021-10-12 16:36 ` [PATCH 5/5] block: pass the start sector to get_max_io_size Christoph Hellwig
2021-10-12 16:36   ` [dm-devel] " 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=20211012163613.994933-4-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=dm-devel@redhat.com \
    --cc=linux-block@vger.kernel.org \
    --cc=snitzer@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.