Commit 2aba0d19 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: add a bdev_max_zone_append_sectors helper 



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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220415045258.199825-16-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 36d25489

drivers/nvme/target/zns.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

fs/zonefs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -678,13 +678,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);

include/linux/blkdev.h

+6 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,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;