From: NeilBrown <neilb@suse.com>
To: Keith Busch <keith.busch@intel.com>,
Maxim Levitsky <maximlevitsky@gmail.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Jens Axboe <axboe@fb.com>,
Dan Williams <dan.j.williams@intel.com>,
Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-nvdimm@ml01.01.org
Subject: [PATCH 2/4] nvdimm/btt: don't allocate unused major device number
Date: Thu, 10 Mar 2016 08:59:28 +1100 [thread overview]
Message-ID: <20160309215928.20904.21111.stgit@noble> (raw)
In-Reply-To: <20160309215702.20904.61407.stgit@noble>
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: NeilBrown <neilb@suse.com>
---
drivers/nvdimm/btt.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index efb2c1ceef98..c32cbb593600 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -31,8 +31,6 @@ enum log_ent_request {
LOG_OLD_ENT
};
-static int btt_major;
-
static int arena_read_bytes(struct arena_info *arena, resource_size_t offset,
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);
btt->btt_disk->driverfs_dev = &btt->nd_btt->dev;
- btt->btt_disk->major = btt_major;
btt->btt_disk->first_minor = 0;
btt->btt_disk->fops = &btt_fops;
btt->btt_disk->private_data = btt;
@@ -1423,22 +1420,11 @@ EXPORT_SYMBOL(nvdimm_namespace_detach_btt);
static int __init nd_btt_init(void)
{
- int rc;
-
- btt_major = register_blkdev(0, "btt");
- if (btt_major < 0)
- return btt_major;
+ int rc = 0;
debugfs_root = debugfs_create_dir("btt", NULL);
- if (IS_ERR_OR_NULL(debugfs_root)) {
+ if (IS_ERR_OR_NULL(debugfs_root))
rc = -ENXIO;
- goto err_debugfs;
- }
-
- return 0;
-
- err_debugfs:
- unregister_blkdev(btt_major, "btt");
return rc;
}
@@ -1446,7 +1432,6 @@ static int __init nd_btt_init(void)
static void __exit nd_btt_exit(void)
{
debugfs_remove_recursive(debugfs_root);
- unregister_blkdev(btt_major, "btt");
}
MODULE_ALIAS_ND_DEVICE(ND_DEVICE_BTT);
next prev parent reply other threads:[~2016-03-09 22:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 21:59 [PATCH 0/4] Remove un-needed 'major' registration when alloc_disk(0) is used NeilBrown
2016-03-09 21:59 ` NeilBrown [this message]
2016-03-10 9:05 ` [PATCH 2/4] nvdimm/btt: don't allocate unused major device number Johannes Thumshirn
2016-03-09 21:59 ` [PATCH 1/4] nvdimm/blk: " NeilBrown
2016-03-10 9:05 ` Johannes Thumshirn
2016-03-09 21:59 ` [PATCH 3/4] memstick: don't allocate unused major for ms_block NeilBrown
2016-03-10 9:06 ` Johannes Thumshirn
2016-03-09 21:59 ` [PATCH 4/4] NVMe: don't allocate unused nvme_major NeilBrown
2016-03-10 9:06 ` Johannes Thumshirn
2016-03-09 23:35 ` [PATCH 0/4] Remove un-needed 'major' registration when alloc_disk(0) is used Dan Williams
2016-03-14 22:50 ` Ross Zwisler
2016-03-15 22:15 ` NeilBrown
2016-03-16 0:20 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160309215928.20904.21111.stgit@noble \
--to=neilb@suse.com \
--cc=axboe@fb.com \
--cc=dan.j.williams@intel.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@ml01.01.org \
--cc=linux-nvme@lists.infradead.org \
--cc=maximlevitsky@gmail.com \
--cc=ross.zwisler@linux.intel.com \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).