afs/include/linux cachefs.h,1.14,1.15

[dwh at infradead.org]

Update of /home/cvs/afs/include/linux
In directory phoenix.infradead.org:/tmp/cvs-serv9327/include/linux

Modified Files:
	cachefs.h 
Log Message:
manoeuvered the source towards hch-compliance (CodingStyle)
fixed a couple of bugs


Index: cachefs.h
===================================================================
RCS file: /home/cvs/afs/include/linux/cachefs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cachefs.h	10 Jun 2003 17:49:48 -0000	1.14
+++ cachefs.h	4 Jul 2003 09:04:43 -0000	1.15
@@ -150,28 +150,6 @@
 			       unsigned long gfp);
 
 /*
- * see if any of the list of pages are cached
- * - for each cached page:
- *   - the page cookie will have been changed to refer to the backing cache
- *     block
- *   - a BIO will have been dispatched to load the page with end_io as the
- *     completion function
- *     - end_io can be NULL, in which case a default function will just unlock
- *       the page
- *     - BIOs may be merged to serve multiple pages that are adjacent on disc
- *   - they will be removed from the page list
- * - all uncached pages will be left on the page list and will be otherwise
- *   untouched
- * - no cache space will be allocated
- * - all pages must be locked before calling
- */
-extern void cachefs_read_pages(struct cachefs_cookie *cookie,
-			       struct address_space *mapping,
-			       struct list_head *pages,
-			       unsigned nr_pages,
-			       bio_end_io_t end_io);
-
-/*
  * request a page be stored in the cache
  * - this request may be ignored if no cache block is currently attached, in which case it
  *   - returns -ENOBUFS
@@ -189,21 +167,6 @@
 			      unsigned long gfp);
 
 /*
- * request a list of pages be stored/updated in the cache
- * - this request may be ignored for any page that has no cache block currently attached, in which
- *   case, that page remains on the list
- * - for any page that has a cache block allocated:
- *   - the page cookie will be updated to reflect the block selected
- *   - the page will be removed from the list
- *   - a BIO will have been dispatched to write the page with end_io as the completion func
- *     - end_io can be NULL, in which case a default function will just clear the writeback bit
- *     - BIOs may be merged to serve multiple pages that are adjacent on disc
- */
-extern void cachefs_write_pages(struct cachefs_cookie *cookie,
-				struct list_head *pages,
-				bio_end_io_t end_io);
-
-/*
  * indicate that caching is no longer required on a page
  * - cannot cancel any outstanding BIOs between this page and the cache
  */
@@ -213,6 +176,7 @@
 /*
  * keep track of pages changed locally but not yet committed
  */
+#if 0 /* TODO */
 extern void cachefs_writeback_prepare(struct cachefs_cookie *cookie,
 				      struct page *page,
 				      unsigned short from,
@@ -227,6 +191,7 @@
 				      struct page *page,
 				      unsigned short from,
 				      unsigned short to);
+#endif
 
 /*
  * convenience routines for mapping page->private directly to a struct cachefs_page