]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
block: factor out a chunk_size_left helper
authorChristoph Hellwig <hch@lst.de>
Tue, 14 Jun 2022 09:09:29 +0000 (11:09 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 27 Jun 2022 12:29:11 +0000 (06:29 -0600)
Factor out a helper from blk_max_size_offset so that it can be reused
independently.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Pankaj Raghav <p.raghav@samsung.com>
Link: https://lore.kernel.org/r/20220614090934.570632-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
include/linux/blkdev.h

index 886c44e9743481a7696b992fd029e96a4cbcb0e1..283961257cc9a112b996c4c6762eadcde67c7e95 100644 (file)
@@ -934,6 +934,17 @@ static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q,
        return q->limits.max_sectors;
 }
 
+/*
+ * Return how much of the chunk is left to be used for I/O at a given offset.
+ */
+static inline unsigned int blk_chunk_sectors_left(sector_t offset,
+               unsigned int chunk_sectors)
+{
+       if (unlikely(!is_power_of_2(chunk_sectors)))
+               return chunk_sectors - sector_div(offset, chunk_sectors);
+       return chunk_sectors - (offset & (chunk_sectors - 1));
+}
+
 /*
  * Return maximum size of a request at given offset. Only valid for
  * file system requests.
@@ -949,12 +960,8 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
                        return q->limits.max_sectors;
        }
 
-       if (likely(is_power_of_2(chunk_sectors)))
-               chunk_sectors -= offset & (chunk_sectors - 1);
-       else
-               chunk_sectors -= sector_div(offset, chunk_sectors);
-
-       return min(q->limits.max_sectors, chunk_sectors);
+       return min(q->limits.max_sectors,
+                       blk_chunk_sectors_left(offset, chunk_sectors));
 }
 
 /*