From: adrian <>
Date: Fri, 21 Dec 2001 06:09:59 +0000 (+0000)
Subject: Modify the store_open_disk_fd tracking a tad so it tracks open fd's
X-Git-Tag: SQUID_3_0_PRE1~1244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4beae3d5d4a92ee4aff54e7287c74a9bf3c4f7;p=thirdparty%2Fsquid.git

Modify the store_open_disk_fd tracking a tad so it tracks open fd's
properly.
---

diff --git a/src/fs/aufs/store_io_aufs.cc b/src/fs/aufs/store_io_aufs.cc
index eaacb0c452..afd65a0858 100644
--- a/src/fs/aufs/store_io_aufs.cc
+++ b/src/fs/aufs/store_io_aufs.cc
@@ -71,7 +71,6 @@ storeAufsOpen(SwapDir * SD, StoreEntry * e, STFNCB * file_callback,
 #else
     storeAufsOpenDone(fd, sio, fd, 0);
 #endif
-    store_open_disk_fd++;
     return sio;
 }
 
@@ -126,7 +125,6 @@ storeAufsCreate(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, STIOCB * c
 #else
     storeAufsOpenDone(fd, sio, fd, 0);
 #endif
-    store_open_disk_fd++;
 
     /* now insert into the replacement policy */
     storeAufsDirReplAdd(SD, e);
@@ -284,6 +282,7 @@ storeAufsOpenDone(int unused, void *my_data, int fd, int errflag)
 	storeAufsIOCallback(sio, DISK_ERROR);
 	return;
     }
+    store_open_disk_fd++;
     aiostate->fd = fd;
     commSetCloseOnExec(fd);
     fd_open(fd, FD_FILE, storeAufsDirFullPath(INDEXSD(sio->swap_dirn), sio->swap_filen, NULL));
@@ -409,12 +408,12 @@ storeAufsIOCallback(storeIOState * sio, int errflag)
     cbdataUnlock(their_data);
     aiostate->fd = -1;
     cbdataFree(sio);
-    store_open_disk_fd--;
     if (fd < 0)
 	return;
     debug(78, 3) ("%s:%d\n", __FILE__, __LINE__);
     aioClose(fd);
     fd_close(fd);
+    store_open_disk_fd--;
     debug(78, 3) ("%s:%d\n", __FILE__, __LINE__);
 }