Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff8e92d5 authored by NeilBrown's avatar NeilBrown Committed by Dan Williams
Browse files

nvdimm/btt: don't allocate unused major device number 



alloc_disk(0) does not require or use a ->major number,
all devices are allocated with a major of BLOCK_EXT_MAJOR.

So don't allocate btt_major.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ec56151d

drivers/nvdimm/btt.c

+2 −17
Original line number Original line Diff line number Diff line
@@ -31,8 +31,6 @@ enum log_ent_request { 
	LOG_OLD_ENT

	LOG_OLD_ENT

};

};





static int btt_major;



static int arena_read_bytes(struct arena_info *arena, resource_size_t offset,

static int arena_read_bytes(struct arena_info *arena, resource_size_t offset,

		void *buf, size_t n)

		void *buf, size_t n)

{

{
@@ -1246,7 +1244,6 @@ static int btt_blk_init(struct btt *btt) 




	nvdimm_namespace_disk_name(ndns, btt->btt_disk->disk_name);

	nvdimm_namespace_disk_name(ndns, btt->btt_disk->disk_name);

	btt->btt_disk->driverfs_dev = &btt->nd_btt->dev;

	btt->btt_disk->driverfs_dev = &btt->nd_btt->dev;

	btt->btt_disk->major = btt_major;

	btt->btt_disk->first_minor = 0;

	btt->btt_disk->first_minor = 0;

	btt->btt_disk->fops = &btt_fops;

	btt->btt_disk->fops = &btt_fops;

	btt->btt_disk->private_data = btt;

	btt->btt_disk->private_data = btt;
@@ -1423,22 +1420,11 @@ EXPORT_SYMBOL(nvdimm_namespace_detach_btt); 




static int __init nd_btt_init(void)

static int __init nd_btt_init(void)

{

{

	int rc;

	int rc = 0;



	btt_major = register_blkdev(0, "btt");

	if (btt_major < 0)

		return btt_major;





	debugfs_root = debugfs_create_dir("btt", NULL);

	debugfs_root = debugfs_create_dir("btt", NULL);

	if (IS_ERR_OR_NULL(debugfs_root)) {

	if (IS_ERR_OR_NULL(debugfs_root))

		rc = -ENXIO;

		rc = -ENXIO;

		goto err_debugfs;

	}



	return 0;



 err_debugfs:

	unregister_blkdev(btt_major, "btt");





	return rc;

	return rc;

}

}
@@ -1446,7 +1432,6 @@ static int __init nd_btt_init(void) 
static void __exit nd_btt_exit(void)

static void __exit nd_btt_exit(void)

{

{

	debugfs_remove_recursive(debugfs_root);

	debugfs_remove_recursive(debugfs_root);

	unregister_blkdev(btt_major, "btt");

}

}





MODULE_ALIAS_ND_DEVICE(ND_DEVICE_BTT);

MODULE_ALIAS_ND_DEVICE(ND_DEVICE_BTT);