tcmu: clean up the code

Signed-off-by: Xiubo Li <xiubli@redhat.com>
open-iscsi · Dec 14, 2018 · f02b7d6 · f02b7d6
1 parent 8c2f43f
commit f02b7d6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 49 deletions.
diff --git a/api.c b/api.c
@@ -377,4 +377,3 @@ void tcmu_thread_cancel(pthread_t thread)
 	if (join_retval != PTHREAD_CANCELED)
 		tcmu_err("unexpected join retval: %p\n", join_retval);
 }
-
diff --git a/glfs.c b/glfs.c
@@ -135,19 +135,19 @@ gluster_compare_hosts(gluster_hostdef *src_server, gluster_hostdef *dst_server)
 		return false;
 
 	switch (src_server->type) {
-		case GLUSTER_TRANSPORT_UNIX:
-			if (!strcmp(src_server->u.uds.socket, dst_server->u.uds.socket))
-				return true;
-			break;
-		case GLUSTER_TRANSPORT_TCP:
-		case GLUSTER_TRANSPORT_RDMA:
-			if (!strcmp(src_server->u.inet.addr, dst_server->u.inet.addr)
-					&&
-				!strcmp(src_server->u.inet.port, dst_server->u.inet.port))
-				return true;
-			break;
-		case GLUSTER_TRANSPORT__MAX:
-			break;
+	case GLUSTER_TRANSPORT_UNIX:
+		if (!strcmp(src_server->u.uds.socket, dst_server->u.uds.socket))
+			return true;
+		break;
+	case GLUSTER_TRANSPORT_TCP:
+	case GLUSTER_TRANSPORT_RDMA:
+		if (!strcmp(src_server->u.inet.addr, dst_server->u.inet.addr)
+				&&
+			!strcmp(src_server->u.inet.port, dst_server->u.inet.port))
+			return true;
+		break;
+	case GLUSTER_TRANSPORT__MAX:
+		break;
 	}
 
 	return false;
@@ -419,9 +419,8 @@ static glfs_t* tcmu_create_glfs_object(struct tcmu_device *dev,
 		goto fail;
 	}
 
-	if (!init) {
+	if (!init)
 		return fs;
-	}
 
 	ret = glfs_set_volfile_server(fs,
 				gluster_transport_lookup[entry->server->type],
@@ -493,9 +492,8 @@ static int tcmu_glfs_open(struct tcmu_device *dev, bool reopen)
 	tcmu_dev_set_write_cache_enabled(dev, 1);
 
 	config = tcmu_get_path(dev);
-	if (!config) {
+	if (!config)
 		goto fail;
-	}
 
 	gfsp->fs = tcmu_create_glfs_object(dev, config, &gfsp->hosts);
 	if (!gfsp->fs) {
@@ -850,14 +848,12 @@ int handler_init(void)
 	int ret;
 
 	ret = pthread_mutex_init(&glfs_lock, NULL);
-	if (ret != 0) {
+	if (ret != 0)
 		return -1;
-	}
 
 	ret = tcmur_register_handler(&glfs_handler);
-	if (ret != 0) {
+	if (ret != 0)
 		pthread_mutex_destroy(&glfs_lock);
-	}
 
 	return ret;
 }
diff --git a/qcow.c b/qcow.c
@@ -318,30 +318,30 @@ static int qcow_validate_header(struct qcow_header *header)
 {
 	if (header->magic != QCOW_MAGIC) {
 		tcmu_err("header is not QCOW\n");
-		 return -1;
+		return -1;
 	}
 	if (header->version != 1) {
 		tcmu_err("version is %d, expected 1\n", header->version);
-		 return -1;
+		return -1;
 	}
 	if (header->cluster_bits < 9 || header->cluster_bits > 16) {
 		tcmu_err("bad cluster_bits = %d\n", header->cluster_bits);
-		 return -1;
+		return -1;
 	}
 	if (header->l2_bits < (9 - 3) || header->l2_bits > (16 - 3)) {
 		tcmu_err("bad l2_bits = %d\n", header->l2_bits);
-		 return -1;
+		return -1;
 	}
 	switch (header->crypt_method) {
-		case QCOW_CRYPT_NONE:
-			break;
-		case QCOW_CRYPT_AES:
-			tcmu_err("QCOW AES-CBC encryption has been deprecated\n");
-			tcmu_err("Convert to unencrypted image using qemu-img\n");
-			 return -1;
-		default:
-			tcmu_err("Invalid encryption value %d\n", header->crypt_method);
-			 return -1;
+	case QCOW_CRYPT_NONE:
+		break;
+	case QCOW_CRYPT_AES:
+		tcmu_err("QCOW AES-CBC encryption has been deprecated\n");
+		tcmu_err("Convert to unencrypted image using qemu-img\n");
+		return -1;
+	default:
+		tcmu_err("Invalid encryption value %d\n", header->crypt_method);
+		return -1;
 	}
 	return 0;
 }
@@ -351,26 +351,26 @@ static int qcow2_validate_header(struct qcow2_header *header)
 	/* TODO check other stuff ... L1, refcount, snapshots */
 	if (header->magic != QCOW_MAGIC) {
 		tcmu_err("header is not QCOW\n");
-		 return -1;
+		return -1;
 	}
 	if (header->version < 2) {
 		tcmu_err("version is %d, expected 2 or 3\n", header->version);
-		 return -1;
+		return -1;
 	}
 	if (header->cluster_bits < 9 || header->cluster_bits > 16) {
 		tcmu_err("bad cluster_bits = %d\n", header->cluster_bits);
-		 return -1;
+		return -1;
 	}
 	switch (header->crypt_method) {
-		case QCOW2_CRYPT_NONE:
-			break;
-		case QCOW2_CRYPT_AES:
-			tcmu_err("QCOW AES-CBC encryption has been deprecated\n");
-			tcmu_err("Convert to unencrypted image using qemu-img\n");
-			 return -1;
-		default:
-			tcmu_err("Invalid encryption value %d\n", header->crypt_method);
-			 return -1;
+	case QCOW2_CRYPT_NONE:
+		break;
+	case QCOW2_CRYPT_AES:
+		tcmu_err("QCOW AES-CBC encryption has been deprecated\n");
+		tcmu_err("Convert to unencrypted image using qemu-img\n");
+		return -1;
+	default:
+		tcmu_err("Invalid encryption value %d\n", header->crypt_method);
+		return -1;
 	}
 	return 0;
 }
@@ -498,7 +498,7 @@ static int qcow_image_open(struct bdev *bdev, int dirfd, const char *pathname, i
 		tcmu_err("Image size is not an integer multiple"
 				 " of the block size\n");
 		goto fail;
-	}	
+	}
 	s->l1_size = l1_size;
 	s->l1_table_offset = header.l1_table_offset;
 
@@ -614,7 +614,7 @@ static int qcow2_image_open(struct bdev *bdev, int dirfd, const char *pathname,
 		tcmu_err("Image size is not an integer multiple"
 				 " of the block size\n");
 		goto fail;
-	}		
+	}
 	s->l1_size = l1_size;
 	// why did they add this to qcow2 ?
 	if (header.l1_size != s->l1_size) {