From: Lee Duncan <lduncan@suse.com>
To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Lee Duncan <lduncan@suse.com>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Tejun Heo <tj@kernel.org>, Hannes Reinecke <hare@suse.com>,
Johannes Thumshirn <jthumshirn@suse.de>,
Christoph Hellwig <hch@infradead.org>,
Matthew Wilcox <willy@linux.intel.com>,
linux-nvme@lists.infradead.org
Subject: [PATCH 3/5] block: nvme-core: simplify ida usage
Date: Thu, 1 Oct 2015 11:59:07 -0700 [thread overview]
Message-ID: <cb1a4e9a77ed39c98072c70a0bebc9b98067852a.1443723136.git.lduncan@suse.com> (raw)
In-Reply-To: <cover.1443723136.git.lduncan@suse.com>
In-Reply-To: <cover.1443723136.git.lduncan@suse.com>
Simplify ida index allocation and removal by
using the ida_simple_* helper functions.
Signed-off-by: Lee Duncan <lduncan@suse.com>
---
drivers/block/nvme-core.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index d1d6141920d3..d354a3391e4a 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2713,18 +2713,10 @@ static DEFINE_IDA(nvme_instance_ida);
static int nvme_set_instance(struct nvme_dev *dev)
{
- int instance, error;
+ int instance;
- do {
- if (!ida_pre_get(&nvme_instance_ida, GFP_KERNEL))
- return -ENODEV;
-
- spin_lock(&dev_list_lock);
- error = ida_get_new(&nvme_instance_ida, &instance);
- spin_unlock(&dev_list_lock);
- } while (error == -EAGAIN);
-
- if (error)
+ instance = ida_simple_get(&nvme_instance_ida, 0, 0, GFP_KERNEL);
+ if (instance < 0)
return -ENODEV;
dev->instance = instance;
@@ -2734,7 +2726,7 @@ static int nvme_set_instance(struct nvme_dev *dev)
static void nvme_release_instance(struct nvme_dev *dev)
{
spin_lock(&dev_list_lock);
- ida_remove(&nvme_instance_ida, dev->instance);
+ ida_simple_remove(&nvme_instance_ida, dev->instance);
spin_unlock(&dev_list_lock);
}
--
2.1.4
next prev parent reply other threads:[~2015-10-01 18:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 18:59 [PATCH 0/5] Modify ida_* users to use ida_simple_* Lee Duncan
2015-10-01 18:59 ` [PATCH 1/5] SCSI: sd: simplify ida usage Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 2/5] block: rsxx: core: " Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` Lee Duncan [this message]
2015-10-02 10:15 ` [PATCH 3/5] block: nvme-core: " Johannes Thumshirn
2015-10-08 14:29 ` Keith Busch
2015-10-01 18:59 ` [PATCH 4/5] block: mtip32xx: " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 5/5] base: soc: siplify " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn
2015-10-05 17:44 ` [PATCH 0/5] Modify ida_* users to use ida_simple_* Tejun Heo
2015-10-05 17:52 ` James Bottomley
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=cb1a4e9a77ed39c98072c70a0bebc9b98067852a.1443723136.git.lduncan@suse.com \
--to=lduncan@suse.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=tj@kernel.org \
--cc=willy@linux.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).