--------------------- PatchSet 8922 Date: 2007/02/17 06:14:32 Author: adri Branch: storework Tag: (none) Log: Fix storeSwapOutMaintainMemObject() to release storeentry's that have their memory partially freed. This is needed as the code assumed the object was on disk but we don't have active disk code at the moment. If an object has its memory freed for some reason then mark it as private. Members: src/store_swapout.c:1.22.10.1->1.22.10.2 Index: squid/src/store_swapout.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store_swapout.c,v retrieving revision 1.22.10.1 retrieving revision 1.22.10.2 diff -u -r1.22.10.1 -r1.22.10.2 --- squid/src/store_swapout.c 15 Feb 2007 10:23:14 -0000 1.22.10.1 +++ squid/src/store_swapout.c 17 Feb 2007 06:14:32 -0000 1.22.10.2 @@ -1,6 +1,6 @@ /* - * $Id: store_swapout.c,v 1.22.10.1 2007/02/15 10:23:14 adri Exp $ + * $Id: store_swapout.c,v 1.22.10.2 2007/02/17 06:14:32 adri Exp $ * * DEBUG: section 20 Storage Manager Swapout Functions * AUTHOR: Duane Wessels @@ -70,6 +70,12 @@ if (new_mem_lo < mem->inmem_lo) new_mem_lo = mem->inmem_lo; if (mem->inmem_lo != new_mem_lo) { + /* Temporary! Since there's no disk backing at the moment we'll have to + * turn these objects into private objects. + */ + storeExpireNow(e); + storeSetPrivateKey(e); + storeReleaseRequest(e); mem->inmem_lo = stmemFreeDataUpto(&mem->data_hdr, new_mem_lo); /* If ENTRY_DEFER_READ is set, then the client side will continue to