Commit 62163f4b authored by Nils Goroll's avatar Nils Goroll Committed by Pål Hermunn Johansen

Simplify cnt_lookup

This is a back port of 4a370dc4

Conflicts:
	bin/varnishd/cache/cache_req_fsm.c
parent a8dc8780
......@@ -400,12 +400,17 @@ cnt_lookup(struct worker *wrk, struct req *req)
AZ(req->objcore);
if (lr == HSH_MISS) {
/* Found nothing or an object that was out of grace */
AN(boc);
AN(boc->flags & OC_F_BUSY);
req->objcore = boc;
req->stale_oc = oc;
req->req_step = R_STP_MISS;
if (boc != NULL) {
/* out-of-grace or ordinary miss */
AN(boc->flags & OC_F_BUSY);
req->objcore = boc;
req->stale_oc = oc;
req->req_step = R_STP_MISS;
} else {
/* hitpass */
AZ(oc);
req->req_step = R_STP_PASS;
}
return (REQ_FSM_MORE);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment