[master] a47c396 Move lruflag setting out of Obj

[Poul-Henning Kamp]

commit a47c39605a339f28f2c14c37f99b9420ae686759
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Feb 3 09:37:40 2016 +0000

    Move lruflag setting out of Obj

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index e5865da..5b375d9 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -299,6 +299,7 @@ EXP_NukeOne(struct worker *wrk, struct lru *lru)
 		if (ObjKill(wrk, oc)) {
 			VSC_C_main->n_lru_nuked++; // XXX per lru ?
 			VTAILQ_REMOVE(&lru->lru_head, oc, lru_list);
+			oc->lru_flags |= OC_LRU_OFFLRU;
 			break;
 		}
 	}
diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c
index 93d7acf..9dda51b 100644
--- a/bin/varnishd/cache/cache_obj.c
+++ b/bin/varnishd/cache/cache_obj.c
@@ -389,7 +389,6 @@ ObjKill(const struct worker *wrk, struct objcore *oc)
 	if (oc->refcnt == 1 && !Lck_Trylock(&oc->objhead->mtx)) {
 		if (oc->refcnt == 1) {
 			oc->exp_flags |= OC_EF_DYING;
-			oc->lru_flags |= OC_LRU_OFFLRU;	/* XXX */
 			oc->refcnt++;
 			retval = 1;
 		}