From ddf8e1d49906ac87b78ab2a8bd3010c827d872b4 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Fri, 27 Mar 2009 12:14:41 +0000
Subject: [PATCH]  - Minor fixes in error recovery paths  - Minor cleanups

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@724 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/src/scst_lib.c  |  4 ++--
 scst/src/scst_main.c | 26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 3b10f5b65..afe5bbc9c 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -995,8 +995,7 @@ static struct scst_tgt_dev *scst_alloc_add_tgt_dev(struct scst_session *sess,
 		      (long long unsigned int)tgt_dev->lun);
 	} else {
 		TRACE_MGMT_DBG("Virtual device %s on SCST lun=%lld",
-			       dev->virt_name,
-			       (long long unsigned int)tgt_dev->lun);
+		       dev->virt_name, (long long unsigned int)tgt_dev->lun);
 	}
 
 	spin_lock_init(&tgt_dev->tgt_dev_lock);
@@ -1125,6 +1124,7 @@ out_thr_free:
 	}
 
 out_free:
+	scst_free_all_UA(tgt_dev);
 	__exit_io_context(tgt_dev->tgt_dev_io_ctx);
 
 	kmem_cache_free(scst_tgtd_cachep, tgt_dev);
diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index 7912c20de..038fa3c5e 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -1113,7 +1113,7 @@ int scst_add_dev_threads(struct scst_device *dev, int num)
 		if (!thr) {
 			res = -ENOMEM;
 			PRINT_ERROR("Failed to allocate thr %d", res);
-			goto out;
+			goto out_del;
 		}
 		strncpy(nm, dev->handler->name, ARRAY_SIZE(nm)-1);
 		nm[ARRAY_SIZE(nm)-1] = '\0';
@@ -1123,7 +1123,7 @@ int scst_add_dev_threads(struct scst_device *dev, int num)
 			res = PTR_ERR(thr->cmd_thread);
 			PRINT_ERROR("kthread_create() failed: %d", res);
 			kfree(thr);
-			goto out;
+			goto out_del;
 		}
 
 		list_add(&thr->thread_list_entry, &dev->threads_list);
@@ -1143,6 +1143,10 @@ int scst_add_dev_threads(struct scst_device *dev, int num)
 out:
 	TRACE_EXIT_RES(res);
 	return res;
+
+out_del:
+	scst_del_dev_threads(dev, i);
+	goto out;
 }
 
 /* Called under scst_mutex and suspended activity */
@@ -1186,6 +1190,9 @@ void scst_del_dev_threads(struct scst_device *dev, int num)
 
 	TRACE_ENTRY();
 
+	if (num == 0)
+		goto out;
+
 	list_for_each_entry_safe_reverse(ct, tmp, &dev->threads_list,
 				thread_list_entry) {
 		int rc;
@@ -1212,6 +1219,7 @@ void scst_del_dev_threads(struct scst_device *dev, int num)
 			break;
 	}
 
+out:
 	TRACE_EXIT();
 	return;
 }
@@ -1360,15 +1368,11 @@ static void scst_threads_info_init(void)
 void __scst_del_global_threads(int num)
 {
 	struct scst_cmd_thread_t *ct, *tmp;
-	int i;
 
 	TRACE_ENTRY();
 
-	i = scst_nr_global_threads;
-	if (num <= 0 || num > i) {
-		PRINT_ERROR("can not del %d cmd threads from %d", num, i);
-		return;
-	}
+	if (num == 0)
+		goto out;
 
 	list_for_each_entry_safe(ct, tmp, &scst_global_threads_list,
 				thread_list_entry) {
@@ -1385,6 +1389,7 @@ void __scst_del_global_threads(int num)
 			break;
 	}
 
+out:
 	TRACE_EXIT();
 	return;
 }
@@ -1428,8 +1433,7 @@ out:
 	return res;
 
 out_error:
-	if (i > 0)
-		__scst_del_global_threads(i - 1);
+	__scst_del_global_threads(i);
 	goto out;
 }
 
@@ -1466,7 +1470,7 @@ static void scst_stop_all_threads(void)
 	TRACE_ENTRY();
 
 	mutex_lock(&scst_global_threads_mutex);
-	__scst_del_global_threads(scst_nr_global_threads);
+	__scst_del_global_threads(-1);
 	if (scst_mgmt_cmd_thread)
 		kthread_stop(scst_mgmt_cmd_thread);
 	if (scst_mgmt_thread)