--------------------- PatchSet 8445 Date: 2006/07/31 21:36:39 Author: serassio Branch: nt Tag: (none) Log: Updated awin32 with latest aufs changes Members: src/fs/awin32/store_dir_aufs.c:1.1.88.7->1.1.88.8 Index: squid/src/fs/awin32/store_dir_aufs.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/awin32/Attic/store_dir_aufs.c,v retrieving revision 1.1.88.7 retrieving revision 1.1.88.8 diff -u -r1.1.88.7 -r1.1.88.8 --- squid/src/fs/awin32/store_dir_aufs.c 31 Jul 2006 10:48:39 -0000 1.1.88.7 +++ squid/src/fs/awin32/store_dir_aufs.c 31 Jul 2006 21:36:39 -0000 1.1.88.8 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_aufs.c,v 1.1.88.7 2006/07/31 10:48:39 serassio Exp $ + * $Id: store_dir_aufs.c,v 1.1.88.8 2006/07/31 21:36:39 serassio Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -1528,6 +1528,7 @@ void storeAufsDirMaintain(SwapDir * SD) { + squidaioinfo_t *aioinfo = (squidaioinfo_t *) SD->fsdata; StoreEntry *e = NULL; int removed = 0; int max_scan; @@ -1550,7 +1551,7 @@ f, max_scan, max_remove); walker = SD->repl->PurgeInit(SD->repl, max_scan); while (1) { - if (SD->cur_size < SD->low_size) + if (SD->cur_size < SD->low_size && aioinfo->map->n_files_in_map < FILEMAP_MAX) break; if (removed >= max_remove) break;