[master] 214e5d58d Cherry-pick from SML_methods instead of taking all and NULL'ing out.

Poul-Henning Kamp phk at FreeBSD.org
Tue Apr 11 13:47:08 UTC 2023


commit 214e5d58d30b983fcf03906337dcf79a16f68c9a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Apr 11 13:29:42 2023 +0000

    Cherry-pick from SML_methods instead of taking all and NULL'ing out.

diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index dc494c5f5..a5e7b40f4 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -683,8 +683,14 @@ smp_init(void)
 {
 	lck_smp = Lck_CreateClass(NULL, "smp");
 	CLI_AddFuncs(debug_cmds);
-	smp_oc_realmethods = SML_methods;
-	smp_oc_realmethods.objtouch = NULL;
+	smp_oc_realmethods.objfree = SML_methods.objfree;
+	smp_oc_realmethods.objiterator = SML_methods.objiterator;
+	smp_oc_realmethods.objgetspace = SML_methods.objgetspace;
+	smp_oc_realmethods.objextend = SML_methods.objextend;
+	smp_oc_realmethods.objbocdone = SML_methods.objbocdone;
+	smp_oc_realmethods.objgetattr = SML_methods.objgetattr;
+	smp_oc_realmethods.objsetattr = SML_methods.objsetattr;
+	smp_oc_realmethods.objtouch = LRU_Touch;
 	smp_oc_realmethods.objfree = smp_oc_objfree;
 }
 


More information about the varnish-commit mailing list