Commit 7fc8fb51 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

null_blk: clean up report zones 



Make the instance name match the method name and define the name to NULL
instead of providing an inline stub, which is rather pointless for a
method call.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e3f89564

drivers/block/null_blk.h

+3 −8
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct nullb { 
#ifdef CONFIG_BLK_DEV_ZONED

int null_zone_init(struct nullb_device *dev);

void null_zone_exit(struct nullb_device *dev);

int null_zone_report(struct gendisk *disk, sector_t sector,

int null_report_zones(struct gendisk *disk, sector_t sector,

		      struct blk_zone *zones, unsigned int *nr_zones);

blk_status_t null_handle_zoned(struct nullb_cmd *cmd,

				enum req_opf op, sector_t sector,
@@ -105,12 +105,6 @@ static inline int null_zone_init(struct nullb_device *dev) 
	return -EINVAL;

}

static inline void null_zone_exit(struct nullb_device *dev) {}

static inline int null_zone_report(struct gendisk *disk, sector_t sector,

				   struct blk_zone *zones,

				   unsigned int *nr_zones)

{

	return -EOPNOTSUPP;

}

static inline blk_status_t null_handle_zoned(struct nullb_cmd *cmd,

					     enum req_opf op, sector_t sector,

					     sector_t nr_sectors)
@@ -123,5 +117,6 @@ static inline size_t null_zone_valid_read_len(struct nullb *nullb, 
{

	return len;

}

#define null_report_zones	NULL

#endif /* CONFIG_BLK_DEV_ZONED */

#endif /* __NULL_BLK_H */

drivers/block/null_blk_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ static void null_config_discard(struct nullb *nullb) 


static const struct block_device_operations null_ops = {

	.owner		= THIS_MODULE,

	.report_zones	= null_zone_report,

	.report_zones	= null_report_zones,

};



static void null_init_queue(struct nullb *nullb, struct nullb_queue *nq)

drivers/block/null_blk_zoned.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void null_zone_exit(struct nullb_device *dev) 
	kvfree(dev->zones);

}



int null_zone_report(struct gendisk *disk, sector_t sector,

int null_report_zones(struct gendisk *disk, sector_t sector,

		      struct blk_zone *zones, unsigned int *nr_zones)

{

	struct nullb *nullb = disk->private_data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE