[v2,1/2] lightnvm: hold lock until finish the target creation

Commit Message

Wenwei Tao May 23, 2016, 9:13 a.m. UTC

From: Wenwei Tao <[e-mail]>

When create a target, we check whether the target is
already exist first. If the answer is no, we release
the lock and continue the creation. This cannot prevent
concurrent creation of the same target, so hold the lock
until finish the target creation.

Signed-off-by: Wenwei Tao <[e-mail]>
---
Changes since v1
-rebase to for-4.8/core

 drivers/lightnvm/gennvm.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index c65fb67..39ff0af 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -44,6 +44,7 @@  static int gen_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
 	struct nvm_tgt_type *tt;
 	struct nvm_target *t;
 	void *targetdata;
+	int ret = -ENOMEM;
 
 	tt = nvm_find_target_type(create->tgttype, 1);
 	if (!tt) {
@@ -55,14 +56,13 @@  static int gen_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
 	t = gen_find_target(gn, create->tgtname);
 	if (t) {
 		pr_err("nvm: target name already exists.\n");
-		mutex_unlock(&gn->lock);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_unlock;
 	}
-	mutex_unlock(&gn->lock);
 
 	t = kmalloc(sizeof(struct nvm_target), GFP_KERNEL);
 	if (!t)
-		return -ENOMEM;
+		goto err_unlock;
 
 	tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node);
 	if (!tqueue)
@@ -95,8 +95,6 @@  static int gen_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
 	t->type = tt;
 	t->disk = tdisk;
 	t->dev = dev;
-
-	mutex_lock(&gn->lock);
 	list_add_tail(&t->list, &gn->targets);
 	mutex_unlock(&gn->lock);
 
@@ -107,7 +105,9 @@  err_queue:
 	blk_cleanup_queue(tqueue);
 err_t:
 	kfree(t);
-	return -ENOMEM;
+err_unlock:
+	mutex_unlock(&gn->lock);
+	return ret;
 }
 
 static void __gen_remove_target(struct nvm_target *t)