---------------------
PatchSet 5664 
Date: 2003/02/16 10:17:42
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Merged aufs updates in awin32 fs module

Members: 
	src/fs/awin32/store_dir_aufs.c:1.1.62.11->1.1.62.12 

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.62.11
retrieving revision 1.1.62.12
diff -u -r1.1.62.11 -r1.1.62.12
--- squid/src/fs/awin32/store_dir_aufs.c	27 Oct 2002 10:46:15 -0000	1.1.62.11
+++ squid/src/fs/awin32/store_dir_aufs.c	16 Feb 2003 10:17:42 -0000	1.1.62.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_aufs.c,v 1.1.62.11 2002/10/27 10:46:15 serassio Exp $
+ * $Id: store_dir_aufs.c,v 1.1.62.12 2003/02/16 10:17:42 serassio Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -561,7 +561,8 @@
 	if (s.op == SWAP_LOG_ADD) {
 	    (void) 0;
 	} else if (s.op == SWAP_LOG_DEL) {
-	    if ((e = storeGet(s.key)) != NULL) {
+	    /* Delete unless we already have a newer copy */
+	    if ((e = storeGet(s.key)) != NULL && s.lastref > e->lastref) {
 		/*
 		 * Make sure we don't unlink the file, it might be
 		 * in use by a subsequent entry.  Also note that