[master] 7b60fe7 Init the correct rwlock

Poul-Henning Kamp phk at FreeBSD.org
Mon Sep 12 06:18:10 CEST 2016


commit 7b60fe7dbff8f5cd0b52ea55e9dafbde51a331e1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 12 04:17:38 2016 +0000

    Init the correct rwlock

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index f0f6897..c214686 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -910,14 +910,13 @@ vcl_cli_label(struct cli *cli, const char * const *av, void *priv)
 		bprintf(lbl->state, "%s", VCL_TEMP_LABEL);
 		lbl->temp = VCL_TEMP_WARM;
 		REPLACE(lbl->loaded_name, av[2]);
-		AZ(errno=pthread_rwlock_init(&vcl->temp_rwl, NULL));
+		AZ(errno=pthread_rwlock_init(&lbl->temp_rwl, NULL));
 		VTAILQ_INSERT_TAIL(&vcl_head, lbl, list);
 	}
 	if (lbl->label != NULL)
 		lbl->label->nlabels--;
 	lbl->label = vcl;
 	vcl->nlabels++;
-	return;
 }
 
 static void __match_proto__(cli_func_t)



More information about the varnish-commit mailing list