null_blk: clean up the block device operations (e3f89564) · Commits · 戴 / test

Remove the pointless stub open and release methods, give the operations vector a slightly less confusing name, and use normal alignment for the assignment operators. Signed-off-by:

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

Damien Le Moal <damien.lemoal@wdc.com> Reviewed-by:

Hannes Reinecke <hare@suse.de> Reviewed-by:

Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

drivers/block/null_blk_main.c

+4 −15

Original line number	Diff line number	Diff line
		@@ -1468,19 +1468,8 @@ static void null_config_discard(struct nullb *nullb)
		blk_queue_flag_set(QUEUE_FLAG_DISCARD, nullb->q);
		}

		static int null_open(struct block_device *bdev, fmode_t mode)
		{
		return 0;
		}

		static void null_release(struct gendisk *disk, fmode_t mode)
		{
		}

		static const struct block_device_operations null_fops = {
		static const struct block_device_operations null_ops = {
		.owner = THIS_MODULE,
		.open = null_open,
		.release = null_release,
		.report_zones = null_zone_report,
		};

		@@ -1582,7 +1571,7 @@ static int null_gendisk_register(struct nullb *nullb)
		disk->flags \|= GENHD_FL_EXT_DEVT \| GENHD_FL_SUPPRESS_PARTITION_INFO;
		disk->major = null_major;
		disk->first_minor = nullb->index;
		disk->fops = &null_fops;
		disk->fops = &null_ops;
		disk->private_data = nullb;
		disk->queue = nullb->q;
		strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN);

Admin message