[master] 5261bdb Revert "Reset busyobj state to BOS_INVALID in VBO_GetBusyObj"

Martin Blix Grydeland martin at varnish-software.com
Thu Mar 20 10:31:33 CET 2014


commit 5261bdb4e83ee71789f8db64af91f7010c15ce6f
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Mar 20 10:30:39 2014 +0100

    Revert "Reset busyobj state to BOS_INVALID in VBO_GetBusyObj"
    
    This reverts commit 0f90ee223daf97d4e6d83a78ae919a95e590bcca.
    
    After looking at this again, I see that the busyobj is cleared as it
    should as part of VBO_DerefBusyObj(). Reverting the patch.

diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index d8be0f6..db1c7a1 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -109,7 +109,6 @@ VBO_GetBusyObj(struct worker *wrk, const struct req *req)
 	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
 	AZ(bo->refcount);
 
-	bo->state = BOS_INVALID;
 	bo->refcount = 1;
 
 	p = (void*)(bo + 1);



More information about the varnish-commit mailing list