[master] 6a8a2ca Make the persistent locks dynamic

[Poul-Henning Kamp]

commit 6a8a2ca5a98cb3156283d68513880e3558fbe88c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 16 23:14:58 2015 +0000

    Make the persistent locks dynamic

diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 330f580..df00621 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -57,6 +57,8 @@
 
 static struct obj_methods smp_oc_realmethods;
 
+static struct VSC_C_lck *lck_smp;
+
 /*--------------------------------------------------------------------*/
 
 /*
@@ -702,10 +704,11 @@ static struct cli_proto debug_cmds[] = {
 void
 SMP_Init(void)
 {
+	lck_smp = Lck_CreateClass("smp");
 	CLI_AddFuncs(debug_cmds);
 	smp_oc_realmethods = SML_methods;
 	smp_oc_realmethods.sml_getobj = smp_oc_methods.sml_getobj;
-	smp_oc_realmethods.objupdatemeta =	smp_oc_methods.objupdatemeta;
+	smp_oc_realmethods.objupdatemeta = smp_oc_methods.objupdatemeta;
 	smp_oc_realmethods.objfree = smp_oc_methods.objfree;
 	smp_oc_realmethods.objgetlru = smp_oc_methods.objgetlru;
 	smp_oc_realmethods.objtouch = NULL;
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index 16af3ac..ccef6d5 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -43,7 +43,6 @@ LOCK(pipestat)
 LOCK(sess)
 LOCK(sma)
 LOCK(smf)
-LOCK(smp)
 LOCK(vbe)
 LOCK(vcapace)
 LOCK(vcl)