Move everything related to the storage-expansion-API into a subdirectory

where it will be protected from VMODs.

bin/varnishd/Makefile.am

@@ -64,16 +64,16 @@ varnishd_SOURCES = \
 	mgt_shmem.c \
 	mgt_vcc.c \
 	rfc2616.c \
-	stevedore.c \
-	stevedore_utils.c \
-	storage_file.c \
-	storage_malloc.c \
-	storage_persistent.c \
-	storage_persistent_mgt.c \
-	storage_persistent_silo.c \
-	storage_persistent_subr.c \
-	storage_synth.c \
-	storage_umem.c \
+	storage/stevedore.c \
+	storage/stevedore_utils.c \
+	storage/storage_file.c \
+	storage/storage_malloc.c \
+	storage/storage_persistent.c \
+	storage/storage_persistent_mgt.c \
+	storage/storage_persistent_silo.c \
+	storage/storage_persistent_subr.c \
+	storage/storage_synth.c \
+	storage/storage_umem.c \
 	varnishd.c \
 	vsm.c
 
@@ -88,8 +88,8 @@ noinst_HEADERS = \
 	heritage.h \
 	mgt.h \
 	mgt_cli.h \
-	storage.h \
-	storage_persistent.h \
+	storage/storage.h \
+	storage/storage_persistent.h \
 	vparam.h
 
 varnishd_CFLAGS = \

bin/varnishd/cache.h

@@ -98,7 +98,6 @@ struct busyobj;
 struct cli;
 struct cli_proto;
 struct director;
-struct exp;
 struct iovec;
 struct objcore;
 struct object;
@@ -106,7 +105,6 @@ struct objhead;
 struct pool;
 struct sess;
 struct sesspool;
-struct storage;
 struct vbc;
 struct vef_priv;
 struct vrt_backend;

bin/varnishd/flint.sh

@@ -16,6 +16,7 @@ flexelint \
 	-I/usr/local/include \
 	-DVARNISH_STATE_DIR=\"foo\" \
 	*.c \
+	storage/*.c \
 	../../lib/libvarnish/*.c \
 	../../lib/libvarnishcompat/execinfo.c \
 	../../lib/libvcl/*.c \

bin/varnishd/stevedore.c → bin/varnishd/storage/stevedore.c

@@ -38,7 +38,7 @@
 
 #include "cache.h"
 
-#include "storage.h"
+#include "storage/storage.h"
 #include "vav.h"
 #include "vcli_priv.h"
 #include "vrt.h"

bin/varnishd/stevedore_utils.c → bin/varnishd/storage/stevedore_utils.c

@@ -51,7 +51,7 @@
 
 #include "mgt.h"
 
-#include "storage.h"
+#include "storage/storage.h"
 #include "vnum.h"
 
 #ifndef O_LARGEFILE

bin/varnishd/storage_file.c → bin/varnishd/storage/storage_file.c

@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 #include "vnum.h"
 

bin/varnishd/storage_malloc.c → bin/varnishd/storage/storage_malloc.c

@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 #include "vnum.h"
 

bin/varnishd/storage_persistent.c → bin/varnishd/storage/storage_persistent.c

@@ -44,7 +44,7 @@
 #include <string.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 #include "hash_slinger.h"
 #include "vcli.h"
@@ -53,7 +53,7 @@
 #include "vsha256.h"
 
 #include "persistent.h"
-#include "storage_persistent.h"
+#include "storage/storage_persistent.h"
 
 /*--------------------------------------------------------------------*/
 

bin/varnishd/storage_persistent_mgt.c → bin/varnishd/storage/storage_persistent_mgt.c

@@ -42,12 +42,12 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 #include "vsha256.h"
 
 #include "persistent.h"
-#include "storage_persistent.h"
+#include "storage/storage_persistent.h"
 
 #ifndef MAP_NOCORE
 #define MAP_NOCORE 0 /* XXX Linux */

bin/varnishd/storage_persistent_silo.c → bin/varnishd/storage/storage_persistent_silo.c

@@ -38,14 +38,14 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 #include "hash_slinger.h"
 #include "vsha256.h"
 #include "vtim.h"
 
 #include "persistent.h"
-#include "storage_persistent.h"
+#include "storage/storage_persistent.h"
 
 /*--------------------------------------------------------------------
  * Write the segmentlist back to the silo.

bin/varnishd/storage_persistent_subr.c → bin/varnishd/storage/storage_persistent_subr.c

@@ -42,12 +42,12 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 #include "vsha256.h"
 
 #include "persistent.h"
-#include "storage_persistent.h"
+#include "storage/storage_persistent.h"
 
 /*--------------------------------------------------------------------
  * SIGNATURE functions

bin/varnishd/storage_synth.c → bin/varnishd/storage/storage_synth.c

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 
 static struct lock		sms_mtx;

bin/varnishd/storage_umem.c → bin/varnishd/storage/storage_umem.c

@@ -40,7 +40,7 @@
 #include <umem.h>
 
 #include "cache.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 static size_t			smu_max = SIZE_MAX;
 static MTX			smu_mtx;