[master] e12880497 Revert "HSH_DerefObjCore signedness fix"
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Fri Nov 13 11:11:15 UTC 2020
commit e128804977f21abc6becff03efd853cd71fd3c69
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Mon Nov 2 11:31:25 2020 +0100
Revert "HSH_DerefObjCore signedness fix"
This reverts commit 5367be3f62f45380ef7b5348eefb88a9c1507318.
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index c9eafa92b..9e80efcb1 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -975,7 +975,7 @@ HSH_DerefBoc(struct worker *wrk, struct objcore *oc)
* Returns zero if target was destroyed.
*/
-unsigned
+int
HSH_DerefObjCore(struct worker *wrk, struct objcore **ocp, int rushmax)
{
struct objcore *oc;
diff --git a/bin/varnishd/cache/cache_objhead.h b/bin/varnishd/cache/cache_objhead.h
index d9a015417..bc1782379 100644
--- a/bin/varnishd/cache/cache_objhead.h
+++ b/bin/varnishd/cache/cache_objhead.h
@@ -66,7 +66,7 @@ struct boc *HSH_RefBoc(const struct objcore *);
void HSH_DerefBoc(struct worker *wrk, struct objcore *);
void HSH_DeleteObjHead(const struct worker *, struct objhead *);
-unsigned HSH_DerefObjCore(struct worker *, struct objcore **, int rushmax);
+int HSH_DerefObjCore(struct worker *, struct objcore **, int rushmax);
#define HSH_RUSH_POLICY -1
enum lookup_e HSH_Lookup(struct req *, struct objcore **, struct objcore **);
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index 9a52edf5b..19d05f768 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -260,7 +260,7 @@ VRB_Ignore(struct req *req)
void
VRB_Free(struct req *req)
{
- unsigned r;
+ int r;
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
@@ -269,6 +269,7 @@ VRB_Free(struct req *req)
r = HSH_DerefObjCore(req->wrk, &req->body_oc, 0);
+
// each busyobj may have gained a reference
assert (r <= req->restarts + 1);
}
More information about the varnish-commit
mailing list