block: fold blk_max_size_offset into get_max_io_size

Now that blk_max_size_offset has a single caller left, fold it into that
and clean up the naming convention for the local variables there.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 4da981efddeede63b2c0cb5a6bfd51c343656ae0..0f5f42ebd0bb0d79295858cc62a9602c3e8dcaea 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -166,9 +166,14 @@ static inline unsigned get_max_io_size(struct request_queue *q,
 {
        unsigned pbs = queue_physical_block_size(q) >> SECTOR_SHIFT;
        unsigned lbs = queue_logical_block_size(q) >> SECTOR_SHIFT;
-       unsigned max_sectors, start, end;
+       unsigned max_sectors = queue_max_sectors(q), start, end;
+
+       if (q->limits.chunk_sectors) {
+               max_sectors = min(max_sectors,
+                       blk_chunk_sectors_left(bio->bi_iter.bi_sector,
+                                              q->limits.chunk_sectors));
+       }
 
-       max_sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector, 0);
        start = bio->bi_iter.bi_sector & (pbs - 1);
        end = (start + max_sectors) & ~(pbs - 1);
        if (end > start)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e66ad451274ec66d3b66b9ce50584ef990ef2641..05e60ee269d91c17ad0210067cc337e04d47f463 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -944,25 +944,6 @@ static inline unsigned int blk_chunk_sectors_left(sector_t offset,
        return chunk_sectors - (offset & (chunk_sectors - 1));
 }
 
-/*
- * Return maximum size of a request at given offset. Only valid for
- * file system requests.
- */
-static inline unsigned int blk_max_size_offset(struct request_queue *q,
-                                              sector_t offset,
-                                              unsigned int chunk_sectors)
-{
-       if (!chunk_sectors) {
-               if (q->limits.chunk_sectors)
-                       chunk_sectors = q->limits.chunk_sectors;
-               else
-                       return q->limits.max_sectors;
-       }
-
-       return min(q->limits.max_sectors,
-                       blk_chunk_sectors_left(offset, chunk_sectors));
-}
-
 /*
  * Access functions for manipulating queue properties
  */