lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 16 Sep 2015 10:50:33 -0700 From: Lee Duncan <lduncan@...e.com> To: linux-scsi@...r.kernel.org, James.Bottomley@...senPartnership.com Cc: linux-kernel@...r.kernel.org, hare@...e.com, jthumshirn@...e.de, hch@...radead.org, Lee Duncan <lduncan@...e.com>, Matthew Wilcox <willy@...ux.intel.com> Subject: [PATCH 15/17] Update the NVMe SSD driver to use ida helper functions. Signed-off-by: Lee Duncan <lduncan@...e.com> --- drivers/block/nvme-core.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index d1d6141920d3..ab13833d4fde 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -2715,15 +2715,7 @@ static int nvme_set_instance(struct nvme_dev *dev) { int instance, error; - 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); - + error = ida_get_index(&nvme_instance_ida, &dev_list_lock, &instance); if (error) return -ENODEV; @@ -2733,9 +2725,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); - spin_unlock(&dev_list_lock); + ida_put_index(&nvme_instance_ida, &dev_list_lock, dev->instance); } static void nvme_free_namespaces(struct nvme_dev *dev) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists