---------------------
PatchSet 401 
Date: 2002/12/15 06:57:45
Author: rbcollins
Branch: unify-io
Tag: (none) 
Log:
move more UFS state members

Members: 
	src/ufscommon.cc:1.4.10.41->1.4.10.42 
	src/ufscommon.h:1.1.20.58->1.1.20.59 
	src/fs/aufs/store_dir_aufs.cc:1.2.12.33->1.2.12.34 
	src/fs/diskd/store_dir_diskd.cc:1.2.16.41->1.2.16.42 
	src/fs/ufs/store_dir_ufs.cc:1.1.20.36->1.1.20.37 

Index: squid3/src/ufscommon.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ufscommon.cc,v
retrieving revision 1.4.10.41
retrieving revision 1.4.10.42
diff -u -r1.4.10.41 -r1.4.10.42
--- squid3/src/ufscommon.cc	15 Dec 2002 06:42:34 -0000	1.4.10.41
+++ squid3/src/ufscommon.cc	15 Dec 2002 06:57:45 -0000	1.4.10.42
@@ -1,5 +1,5 @@
 /*
- * $Id: ufscommon.cc,v 1.4.10.41 2002/12/15 06:42:34 rbcollins Exp $
+ * $Id: ufscommon.cc,v 1.4.10.42 2002/12/15 06:57:45 rbcollins Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -144,11 +144,10 @@
 int
 UFSSwapDir::mapBitAllocate()
 {
-    squidufsinfo_t *ioinfo = (squidufsinfo_t *) fsdata;
     int fn;
-    fn = file_map_allocate(map, ioinfo->suggest);
+    fn = file_map_allocate(map, suggest);
     file_map_bit_set(map, fn);
-    ioinfo->suggest = fn + 1;
+    suggest = fn + 1;
     return fn;
 }
 
@@ -1306,11 +1305,10 @@
 void
 UFSSwapDir::unlinkFile(sfileno f)
 {
-    squidufsinfo_t *ioinfo = (squidufsinfo_t *)fsdata;
     debug(79, 3) ("commonUfsDirUnlinkFile: unlinking fileno %08X\n", f);
     /* commonUfsDirMapBitReset(this, f); */
-    assert(ioinfo->io.storeDirUnlinkFile);
-    ioinfo->io.storeDirUnlinkFile(fullPath(f, NULL));
+    assert(io.storeDirUnlinkFile);
+    io.storeDirUnlinkFile(fullPath(f, NULL));
 }
 
 
Index: squid3/src/ufscommon.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ufscommon.h,v
retrieving revision 1.1.20.58
retrieving revision 1.1.20.59
diff -u -r1.1.20.58 -r1.1.20.59
--- squid3/src/ufscommon.h	15 Dec 2002 06:42:34 -0000	1.1.20.58
+++ squid3/src/ufscommon.h	15 Dec 2002 06:57:46 -0000	1.1.20.59
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ufscommon.h,v 1.1.20.58 2002/12/15 06:42:34 rbcollins Exp $
+ * $Id: ufscommon.h,v 1.1.20.59 2002/12/15 06:57:46 rbcollins Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -48,9 +48,7 @@
 struct _squidufsinfo_t {
     int l1;
     int l2;
-//    fileMap *map;
-    int suggest;
-    iospecific_t io;
+//    int suggest;
 };
 
 /* Common UFS routines */
@@ -119,6 +117,8 @@
     void *fsdata;
 protected:
     fileMap *map;
+    iospecific_t io;
+    int suggest;
 private:
     int swaplog_fd;
   static EVH CleanEvent;
Index: squid3/src/fs/aufs/store_dir_aufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_dir_aufs.cc,v
retrieving revision 1.2.12.33
retrieving revision 1.2.12.34
diff -u -r1.2.12.33 -r1.2.12.34
--- squid3/src/fs/aufs/store_dir_aufs.cc	15 Dec 2002 02:34:36 -0000	1.2.12.33
+++ squid3/src/fs/aufs/store_dir_aufs.cc	15 Dec 2002 06:57:46 -0000	1.2.12.34
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_aufs.cc,v 1.2.12.33 2002/12/15 02:34:36 rbcollins Exp $
+ * $Id: store_dir_aufs.cc,v 1.2.12.34 2002/12/15 06:57:46 rbcollins Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -184,9 +184,7 @@
     fsdata = aioinfo;
     aioinfo->l1 = l1;
     aioinfo->l2 = l2;
-    map = NULL;	/* Debugging purposes */
-    aioinfo->suggest = 0;
-    aioinfo->io.storeDirUnlinkFile = storeAufsDirIOUnlinkFile;
+    io.storeDirUnlinkFile = storeAufsDirIOUnlinkFile;
 
     parse_cachedir_options(this, options, 0);
 
Index: squid3/src/fs/diskd/store_dir_diskd.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_dir_diskd.cc,v
retrieving revision 1.2.16.41
retrieving revision 1.2.16.42
diff -u -r1.2.16.41 -r1.2.16.42
--- squid3/src/fs/diskd/store_dir_diskd.cc	15 Dec 2002 02:34:36 -0000	1.2.16.41
+++ squid3/src/fs/diskd/store_dir_diskd.cc	15 Dec 2002 06:57:46 -0000	1.2.16.42
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_diskd.cc,v 1.2.16.41 2002/12/15 02:34:36 rbcollins Exp $
+ * $Id: store_dir_diskd.cc,v 1.2.16.42 2002/12/15 06:57:46 rbcollins Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -389,8 +389,7 @@
     max_size = size;
     ufsinfo->l1 = l1;
     ufsinfo->l2 = l2;
-    ufsinfo->suggest = 0;
-    ufsinfo->io.storeDirUnlinkFile = storeDiskdDirIOUnlinkFile;
+    io.storeDirUnlinkFile = storeDiskdDirIOUnlinkFile;
 
     parse_cachedir_options(this, options, 0);
 
Index: squid3/src/fs/ufs/store_dir_ufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/store_dir_ufs.cc,v
retrieving revision 1.1.20.36
retrieving revision 1.1.20.37
diff -u -r1.1.20.36 -r1.1.20.37
--- squid3/src/fs/ufs/store_dir_ufs.cc	15 Dec 2002 02:34:36 -0000	1.1.20.36
+++ squid3/src/fs/ufs/store_dir_ufs.cc	15 Dec 2002 06:57:46 -0000	1.1.20.37
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.1.20.36 2002/12/15 02:34:36 rbcollins Exp $
+ * $Id: store_dir_ufs.cc,v 1.1.20.37 2002/12/15 06:57:46 rbcollins Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -165,8 +165,7 @@
     fsdata = ufsinfo;
     ufsinfo->l1 = l1;
     ufsinfo->l2 = l2;
-    ufsinfo->suggest = 0;
-    ufsinfo->io.storeDirUnlinkFile = storeUfsDirIOUnlinkFile;
+    io.storeDirUnlinkFile = storeUfsDirIOUnlinkFile;
 
     parse_cachedir_options(this, options, 1);
 
@@ -205,7 +204,7 @@
     createSwapSubDirs();
 }
 
-UFSSwapDir::UFSSwapDir() : IO(NULL), map(NULL), swaplog_fd (-1) {}
+UFSSwapDir::UFSSwapDir() : IO(NULL), map(NULL), suggest(0), swaplog_fd (-1) {}
 
 UFSSwapDir::~UFSSwapDir()
 {