@@ 59,7 59,7 @@ struct state {
 	int nfds;
 };
 
-struct socksvc {
+struct cb {
 	struct socksvc_stats stats;
 	struct state *state;
 	int fd;

          
@@ 71,7 71,7 @@ static atomic_t server_shutdown;
 static void __attribute__((constructor)) init_socksvc_subsys(void)
 {
 	socksvc_cache = mem_cache_create("socksvc-cache",
-					 sizeof(struct socksvc), 0);
+					 sizeof(struct cb), 0);
 	ASSERT(!IS_ERR(socksvc_cache));
 }
 

          
@@ 195,7 195,7 @@ static void stop_listening(struct state 
 
 static void wrap_taskq_callback(void *arg)
 {
-	struct socksvc *cb = arg;
+	struct cb *cb = arg;
 
 	cb->stats.dequeued_time = gettime();
 

          
@@ 238,7 238,7 @@ static void accept_conns(struct state *s
 				strerror(errno));
 
 		for (i = 0; (i < state->nfds) && (ret > 0); i++) {
-			struct socksvc *cb;
+			struct cb *cb;
 
 			if (!FD_ISSET(state->fds[i], &set))
 				continue;