---------------------
PatchSet 325 
Date: 2002/12/12 02:31:20
Author: rbcollins
Branch: unify-io
Tag: (none) 
Log:
and eliminate aufs's read_ call

Members: 
	src/fs/aufs/store_asyncufs.h:1.2.12.25->1.2.12.26 
	src/fs/aufs/store_io_aufs.cc:1.3.12.25->1.3.12.26 
	src/fs/ufs/store_io_ufs.cc:1.3.10.32->1.3.10.33 

Index: squid3/src/fs/aufs/store_asyncufs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_asyncufs.h,v
retrieving revision 1.2.12.25
retrieving revision 1.2.12.26
diff -u -r1.2.12.25 -r1.2.12.26
--- squid3/src/fs/aufs/store_asyncufs.h	12 Dec 2002 02:11:32 -0000	1.2.12.25
+++ squid3/src/fs/aufs/store_asyncufs.h	12 Dec 2002 02:31:20 -0000	1.2.12.26
@@ -130,7 +130,6 @@
 	unsigned int read_kicking:1;
 	unsigned int inreaddone:1;
     } flags;
-    void read_(char *buf, size_t size, off_t offset, STRCB * callback, void *callback_data);
     virtual void write(char *buf, size_t size, off_t offset, FREE * free_func);
     link_list *pending_writes;
     void ioCompletedNotification();
Index: squid3/src/fs/aufs/store_io_aufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_io_aufs.cc,v
retrieving revision 1.3.12.25
retrieving revision 1.3.12.26
diff -u -r1.3.12.25 -r1.3.12.26
--- squid3/src/fs/aufs/store_io_aufs.cc	11 Dec 2002 21:45:23 -0000	1.3.12.25
+++ squid3/src/fs/aufs/store_io_aufs.cc	12 Dec 2002 02:31:20 -0000	1.3.12.26
@@ -263,29 +263,6 @@
     return fd > -1;
 }
 
-/* Read */
-void
-squidaiostate_t::read_(char *buf, size_t size, off_t offset, STRCB * callback, void *callback_data)
-{
-    assert(read.callback == NULL);
-    assert(read.callback_data == NULL);
-    assert(!reading);
-    if (!theFile->canRead()) {
-	debug(79, 3) ("storeAufsRead: queueing read because theFile can't read\n");
-	queueRead (buf, size, offset, callback, callback_data);
-	return;
-    }
-    read.callback = callback;
-    read.callback_data = cbdataReference(callback_data);
-    read_buf = buf;
-    debug(79, 3) ("storeAufsRead: dirno %d, fileno %08X, FD %d\n",
-	swap_dirn, swap_filen, fd);
-    offset_ = offset;
-    reading = true;
-    theFile->read(buf, offset, size);
-}
-
-
 /* Write */
 void
 squidaiostate_t::write(char *buf, size_t size, off_t offset, FREE * free_func)
Index: squid3/src/fs/ufs/store_io_ufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/store_io_ufs.cc,v
retrieving revision 1.3.10.32
retrieving revision 1.3.10.33
diff -u -r1.3.10.32 -r1.3.10.33
--- squid3/src/fs/ufs/store_io_ufs.cc	12 Dec 2002 02:11:32 -0000	1.3.10.32
+++ squid3/src/fs/ufs/store_io_ufs.cc	12 Dec 2002 02:31:20 -0000	1.3.10.33
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_ufs.cc,v 1.3.10.32 2002/12/12 02:11:32 rbcollins Exp $
+ * $Id: store_io_ufs.cc,v 1.3.10.33 2002/12/12 02:31:20 rbcollins Exp $
  *
  * DEBUG: section 79    Storage Manager UFS Interface
  * AUTHOR: Duane Wessels
@@ -261,6 +261,11 @@
     assert(!reading);
     assert(!closing);
     assert (callback);
+    if (!theFile->canRead()) {
+	debug(79, 3) ("UFSStoreState::read_: queueing read because theFile can't read\n");
+	queueRead (buf, size, offset, callback, callback_data);
+	return;
+    }
     read.callback = callback;
     read.callback_data = cbdataReference(callback_data);
     debug(79, 3) ("UFSStoreState::read_: dirno %d, fileno %08X\n",