lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 1017/1095] block: add a bdev_max_zone_append_sectors helper
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 2aba0d19f4d8c8929b4b3b94a9cfde2aa20e6ee2 ]

    Add a helper to check the max supported sectors for zone append based on
    the block_device instead of having to poke into the block layer internal
    request_queue.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
    Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
    Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
    Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
    Link: https://lore.kernel.org/r/20220415045258.199825-16-hch@lst.de
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/target/zns.c | 3 +--
    fs/zonefs/super.c | 3 +--
    include/linux/blkdev.h | 6 ++++++
    3 files changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/nvme/target/zns.c b/drivers/nvme/target/zns.c
    index e34718b09550..82b61acf7a72 100644
    --- a/drivers/nvme/target/zns.c
    +++ b/drivers/nvme/target/zns.c
    @@ -34,8 +34,7 @@ static int validate_conv_zones_cb(struct blk_zone *z,

    bool nvmet_bdev_zns_enable(struct nvmet_ns *ns)
    {
    - struct request_queue *q = ns->bdev->bd_disk->queue;
    - u8 zasl = nvmet_zasl(queue_max_zone_append_sectors(q));
    + u8 zasl = nvmet_zasl(bdev_max_zone_append_sectors(ns->bdev));
    struct gendisk *bd_disk = ns->bdev->bd_disk;
    int ret;

    diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
    index 15a4c7c07a3b..b68798a572fc 100644
    --- a/fs/zonefs/super.c
    +++ b/fs/zonefs/super.c
    @@ -723,13 +723,12 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
    struct inode *inode = file_inode(iocb->ki_filp);
    struct zonefs_inode_info *zi = ZONEFS_I(inode);
    struct block_device *bdev = inode->i_sb->s_bdev;
    - unsigned int max;
    + unsigned int max = bdev_max_zone_append_sectors(bdev);
    struct bio *bio;
    ssize_t size;
    int nr_pages;
    ssize_t ret;

    - max = queue_max_zone_append_sectors(bdev_get_queue(bdev));
    max = ALIGN_DOWN(max << SECTOR_SHIFT, inode->i_sb->s_blocksize);
    iov_iter_truncate(from, max);

    diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
    index cc6b24a5098f..34f2b88dfd6e 100644
    --- a/include/linux/blkdev.h
    +++ b/include/linux/blkdev.h
    @@ -1190,6 +1190,12 @@ static inline unsigned int queue_max_zone_append_sectors(const struct request_qu
    return min(l->max_zone_append_sectors, l->max_sectors);
    }

    +static inline unsigned int
    +bdev_max_zone_append_sectors(struct block_device *bdev)
    +{
    + return queue_max_zone_append_sectors(bdev_get_queue(bdev));
    +}
    +
    static inline unsigned queue_logical_block_size(const struct request_queue *q)
    {
    int retval = 512;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:25    [W:4.024 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site