tcmur_device: rename lock to cmds_list_lock

Signed-off-by: Xiubo Li <[email protected]>

Author: lxbsz

main.c

@@ -681,7 +681,7 @@ static bool get_next_cmd_timeout(struct tcmu_device *dev,
 
 	memset(tmo, 0, sizeof(*tmo));
 
-	pthread_spin_lock(&rdev->lock);
+	pthread_spin_lock(&rdev->cmds_list_lock);
 	list_for_each(&rdev->cmds_list, tcmur_cmd, cmds_list_entry) {
 		if (tcmur_cmd->timed_out)
 			continue;
@@ -705,7 +705,7 @@ static bool get_next_cmd_timeout(struct tcmu_device *dev,
 			     (intmax_t)curr_time->tv_sec, (intmax_t)tcmur_cmd->start_time.tv_sec);
 		break;
 	}
-	pthread_spin_unlock(&rdev->lock);
+	pthread_spin_unlock(&rdev->cmds_list_lock);
 
 	return has_timeout;
 }
@@ -728,7 +728,7 @@ static void check_for_timed_out_cmds(struct tcmu_device *dev)
 	if (tcmur_get_time(dev, &curr_time))
 		return;
 
-	pthread_spin_lock(&rdev->lock);
+	pthread_spin_lock(&rdev->cmds_list_lock);
 	list_for_each(&rdev->cmds_list, tcmur_cmd, cmds_list_entry) {
 		if (tcmur_cmd->timed_out)
 			continue;
@@ -758,7 +758,7 @@ static void check_for_timed_out_cmds(struct tcmu_device *dev)
 		 */
 	       tcmu_notify_cmd_timed_out(dev);
 	}
-	pthread_spin_unlock(&rdev->lock);
+	pthread_spin_unlock(&rdev->cmds_list_lock);
 }
 
 static void tcmur_tcmulib_cmd_start(struct tcmu_device *dev,
@@ -775,9 +775,9 @@ static void tcmur_tcmulib_cmd_start(struct tcmu_device *dev,
 	if (rdev->cmd_time_out) {
 		tcmur_cmd->start_time.tv_sec = curr_time->tv_sec;
 
-		pthread_spin_lock(&rdev->lock);
+		pthread_spin_lock(&rdev->cmds_list_lock);
 		list_add_tail(&rdev->cmds_list, &tcmur_cmd->cmds_list_entry);
-		pthread_spin_unlock(&rdev->lock);
+		pthread_spin_unlock(&rdev->cmds_list_lock);
 	}
 }
 
@@ -1020,7 +1020,7 @@ static int dev_added(struct tcmu_device *dev)
 	tcmu_dev_dbg(dev, "Got block_size %d, size in bytes %"PRId64"\n",
 		     block_size, dev_size);
 
-	ret = pthread_spin_init(&rdev->lock, 0);
+	ret = pthread_spin_init(&rdev->cmds_list_lock, 0);
 	if (ret) {
 		ret = -ret;
 		goto free_rdev;
@@ -1095,7 +1095,7 @@ static int dev_added(struct tcmu_device *dev)
 cleanup_caw_lock:
 	pthread_mutex_destroy(&rdev->caw_lock);
 cleanup_dev_lock:
-	pthread_spin_destroy(&rdev->lock);
+	pthread_spin_destroy(&rdev->cmds_list_lock);
 free_rdev:
 	free(rdev);
 	return ret;
@@ -1142,7 +1142,7 @@ static void dev_removed(struct tcmu_device *dev)
 	if (ret != 0)
 		tcmu_err("could not cleanup caw lock %d\n", ret);
 
-	ret = pthread_spin_destroy(&rdev->lock);
+	ret = pthread_spin_destroy(&rdev->cmds_list_lock);
 	if (ret != 0)
 		tcmu_err("could not cleanup mailbox lock %d\n", ret);
 

tcmur_cmd_handler.c

@@ -40,8 +40,8 @@ void tcmur_tcmulib_cmd_complete(struct tcmu_device *dev,
 	struct tcmur_cmd *tcmur_cmd = cmd->hm_private;
 	struct timespec curr_time;
 
-	pthread_cleanup_push(_cleanup_spin_lock, (void *)&rdev->lock);
-	pthread_spin_lock(&rdev->lock);
+	pthread_cleanup_push(_cleanup_spin_lock, (void *)&rdev->cmds_list_lock);
+	pthread_spin_lock(&rdev->cmds_list_lock);
 
 	if (tcmur_cmd->timed_out) {
 		if (tcmur_get_time(dev, &curr_time)) {
@@ -60,7 +60,7 @@ void tcmur_tcmulib_cmd_complete(struct tcmu_device *dev,
 
 	tcmulib_command_complete(dev, cmd, rc);
 
-	pthread_spin_unlock(&rdev->lock);
+	pthread_spin_unlock(&rdev->cmds_list_lock);
 	pthread_cleanup_pop(0);
 }
 

tcmur_device.h

@@ -75,13 +75,14 @@ struct tcmur_device {
         struct tcmu_io_queue work_queue;
         struct tcmu_track_aio track_queue;
 
-	pthread_spinlock_t lock; /* protects concurrent updates to mailbox */
 	pthread_mutex_t caw_lock; /* for atomic CAW operation */
 
 	uint32_t format_progress;
 	pthread_mutex_t format_lock; /* for atomic format operations */
 
 	int cmd_time_out;
+
+	pthread_spinlock_t cmds_list_lock; /* protects cmds_list */
 	struct list_head cmds_list;
 };