---------------------
PatchSet 1462 
Date: 2001/01/31 15:12:01
Author: darius
Branch: sfs
Tag: (none) 
Log:
fixed so rebuild returns instantly (faked - zero responses.  Working
on doing "the right thing(tm)" underneath).

Members: 
	src/fs/sfs/sfs_llo.c:1.1.2.11->1.1.2.12 
	src/fs/sfs/store_dir_sfs.c:1.1.2.7->1.1.2.8 
	src/fs/sfs/store_sfs.h:1.1.2.3->1.1.2.4 

Index: squid/src/fs/sfs/sfs_llo.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/sfs/Attic/sfs_llo.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- squid/src/fs/sfs/sfs_llo.c	31 Jan 2001 15:09:35 -0000	1.1.2.11
+++ squid/src/fs/sfs/sfs_llo.c	31 Jan 2001 15:12:01 -0000	1.1.2.12
@@ -385,6 +385,7 @@
 	}
     }
     *cur = 0;
+    return -2;
 }
 
 void
Index: squid/src/fs/sfs/store_dir_sfs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/sfs/Attic/store_dir_sfs.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid/src/fs/sfs/store_dir_sfs.c	31 Jan 2001 15:09:35 -0000	1.1.2.7
+++ squid/src/fs/sfs/store_dir_sfs.c	31 Jan 2001 15:12:01 -0000	1.1.2.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_sfs.c,v 1.1.2.7 2001/01/31 15:09:35 adri Exp $
+ * $Id: store_dir_sfs.c,v 1.1.2.8 2001/01/31 15:12:01 darius Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -352,6 +352,7 @@
     int fd = -1;
     tlv *tlv_list;
     tlv *t;
+
     sfsblock_t currentEntry;
     sfsinfo_t *sfsinfo = rb->sd->fsdata;
 
@@ -359,7 +360,10 @@
     debug(20, 3) ("storeSfsDirRebuildFromDirectory: DIR #%d\n", rb->sd->index);
 
     /* We don't do anything right now */
+    store_dirs_rebuilding--;
+    storeSfsDirCloseTmpSwapLog(rb->sd);
     storeRebuildComplete(&rb->counts);
+    cbdataFree(rb);
     return;
 
     currentEntry = 0;
Index: squid/src/fs/sfs/store_sfs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/sfs/Attic/store_sfs.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid/src/fs/sfs/store_sfs.h	28 Jan 2001 18:48:48 -0000	1.1.2.3
+++ squid/src/fs/sfs/store_sfs.h	31 Jan 2001 15:12:01 -0000	1.1.2.4
@@ -44,6 +44,7 @@
 extern void storeSfsDirUnlinkFile(SwapDir *, sfileno);
 extern void storeSfsDirReplAdd(SwapDir * SD, StoreEntry *);
 extern void storeSfsDirReplRemove(StoreEntry *);
+extern int sfs_openNextInode(sfsid_t sfsid, sfsblock_t *cur);
 
 /*
  * Store IO stuff