Merge of doom

2012-06-07 14:40:55 +01:00
parent 5930f25034 40f0f9fab6
commit 1cd8f4660f
7 changed files with 78 additions and 51 deletions
--- a/src/serve.h
+++ b/src/serve.h
@@ -76,7 +76,7 @@ struct server {
 	int                  server_fd;
 	int                  control_fd;
 	
-	char*                block_allocation_map;
+	struct bitset_mapping* allocation_map;
 	
 	struct client_tbl_entry nbd_client[MAX_NBD_CLIENTS];
 };