Commit b09dcf58 authored by NeilBrown's avatar NeilBrown Committed by Jens Axboe
Browse files

NVMe: don't allocate unused nvme_major 

When alloc_disk(0) is used, the ->major number is ignored.  All device
numbers are allocated with a major of BLOCK_EXT_MAJOR.

So remove all references to nvme_major.

[akpm@linux-foundation.org: one unregister_blkdev() was missed]
Link: http://lkml.kernel.org/r/20160602064318.4403.93301.stgit@noble


Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2fa84351

drivers/nvme/host/core.c

+1 −15
Original line number Original line Diff line number Diff line
@@ -53,9 +53,6 @@ module_param_named(max_retries, nvme_max_retries, uint, 0644); 
MODULE_PARM_DESC(max_retries, "max number of retries a command may have");

MODULE_PARM_DESC(max_retries, "max number of retries a command may have");

EXPORT_SYMBOL_GPL(nvme_max_retries);

EXPORT_SYMBOL_GPL(nvme_max_retries);





static int nvme_major;

module_param(nvme_major, int, 0);



static int nvme_char_major;

static int nvme_char_major;

module_param(nvme_char_major, int, 0);

module_param(nvme_char_major, int, 0);
@@ -1674,8 +1671,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	blk_queue_logical_block_size(ns->queue, 1 << ns->lba_shift);

	blk_queue_logical_block_size(ns->queue, 1 << ns->lba_shift);

	nvme_set_queue_limits(ctrl, ns->queue);

	nvme_set_queue_limits(ctrl, ns->queue);





	disk->major = nvme_major;

	disk->first_minor = 0;

	disk->fops = &nvme_fops;

	disk->fops = &nvme_fops;

	disk->private_data = ns;

	disk->private_data = ns;

	disk->queue = ns->queue;

	disk->queue = ns->queue;
@@ -2085,16 +2080,10 @@ int __init nvme_core_init(void) 
{

{

	int result;

	int result;





	result = register_blkdev(nvme_major, "nvme");

	if (result < 0)

		return result;

	else if (result > 0)

		nvme_major = result;



	result = __register_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme",

	result = __register_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme",

							&nvme_dev_fops);

							&nvme_dev_fops);

	if (result < 0)

	if (result < 0)

		goto unregister_blkdev;

		return result;

	else if (result > 0)

	else if (result > 0)

		nvme_char_major = result;

		nvme_char_major = result;
@@ -2108,8 +2097,6 @@ int __init nvme_core_init(void) 




 unregister_chrdev:

 unregister_chrdev:

	__unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme");

	__unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme");

 unregister_blkdev:

	unregister_blkdev(nvme_major, "nvme");

	return result;

	return result;

}

}
@@ -2117,7 +2104,6 @@ void nvme_core_exit(void) 
{

{

	class_destroy(nvme_class);

	class_destroy(nvme_class);

	__unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme");

	__unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme");

	unregister_blkdev(nvme_major, "nvme");

}

}





MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE