leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lightnvm: refactor dev->online_target to global nvm_targets

Browse Source 
A target name must be unique. However, a per-device registration of
targets is maintained on a dev->online_targets list, with a per-device
search for targets upon registration.

This results in a name collision when two targets, with the same name,
are created on two different targets, where the per-device list is not
shared.

Signed-off-by: Simon A. F. Lund <slund@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Simon A. F. Lund 2016-05-06 20:03:03 +02:00 committed by Jens Axboe
parent 6063fe399d
commit 6f8645cba5
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/lightnvm/core.c
View File

@ -33,8 +33,20 @@
static LIST_HEAD(nvm_tgt_types); static LIST_HEAD(nvm_tgt_types);
static LIST_HEAD(nvm_mgrs); static LIST_HEAD(nvm_mgrs);
static LIST_HEAD(nvm_devices); static LIST_HEAD(nvm_devices);
static LIST_HEAD(nvm_targets);
static DECLARE_RWSEM(nvm_lock); static DECLARE_RWSEM(nvm_lock);
static struct nvm_target *nvm_find_target(const char *name)
{
struct nvm_target *tgt;
list_for_each_entry(tgt, &nvm_targets, list)
if (!strcmp(name, tgt->disk->disk_name))
return tgt;
return NULL;
}
static struct nvm_tgt_type *nvm_find_target_type(const char *name) static struct nvm_tgt_type *nvm_find_target_type(const char *name)
{ {
struct nvm_tgt_type *tt; struct nvm_tgt_type *tt;
@ -564,7 +576,6 @@ static int nvm_core_init(struct nvm_dev *dev)
goto err_fmtype; goto err_fmtype;
} }
INIT_LIST_HEAD(&dev->online_targets);
mutex_init(&dev->mlock); mutex_init(&dev->mlock);
spin_lock_init(&dev->lock); spin_lock_init(&dev->lock);
@ -744,12 +755,11 @@ static int nvm_create_target(struct nvm_dev *dev,
return -EINVAL; return -EINVAL;
} }
list_for_each_entry(t, &dev->online_targets, list) { t = nvm_find_target(create->tgtname);
if (!strcmp(create->tgtname, t->disk->disk_name)) { if (t) {
pr_err("nvm: target name already exists.\n"); pr_err("nvm: target name already exists.\n");
up_write(&nvm_lock); up_write(&nvm_lock);
return -EINVAL; return -EINVAL;
}
} }
up_write(&nvm_lock); up_write(&nvm_lock);
@ -789,7 +799,7 @@ static int nvm_create_target(struct nvm_dev *dev,
t->disk = tdisk; t->disk = tdisk;
down_write(&nvm_lock); down_write(&nvm_lock);
list_add_tail(&t->list, &dev->online_targets); list_add_tail(&t->list, &nvm_targets);
up_write(&nvm_lock); up_write(&nvm_lock);
return 0; return 0;
@ -852,26 +862,19 @@ static int __nvm_configure_create(struct nvm_ioctl_create *create)
static int __nvm_configure_remove(struct nvm_ioctl_remove *remove) static int __nvm_configure_remove(struct nvm_ioctl_remove *remove)
{ {
struct nvm_target *t = NULL; struct nvm_target *t;
struct nvm_dev *dev;
int ret = -1;
down_write(&nvm_lock); down_write(&nvm_lock);
list_for_each_entry(dev, &nvm_devices, devices) t = nvm_find_target(remove->tgtname);
list_for_each_entry(t, &dev->online_targets, list) { if (!t) {
if (!strcmp(remove->tgtname, t->disk->disk_name)) {
nvm_remove_target(t);
ret = 0;
break;
}
}
up_write(&nvm_lock);
if (ret) {
pr_err("nvm: target \"%s\" doesn't exist.\n", remove->tgtname); pr_err("nvm: target \"%s\" doesn't exist.\n", remove->tgtname);
up_write(&nvm_lock);
return -EINVAL; return -EINVAL;
} }
nvm_remove_target(t);
up_write(&nvm_lock);
return 0; return 0;
} }

1
include/linux/lightnvm.h
View File

@ -308,7 +308,6 @@ struct nvm_dev {
struct nvm_dev_ops *ops; struct nvm_dev_ops *ops;
struct list_head devices; struct list_head devices;
struct list_head online_targets;
/* Media manager */ /* Media manager */
struct nvmm_type *mt; struct nvmm_type *mt;