Subject: afs/fs/afs volume.h,1.7,1.8 volume.c,1.10,1.11 vnode.h,1.6,1.7 vnode.c,1.9,1.10 vlocation.c,1.12,1.13 internal.h,1.17,1.18 inode.c,1.12,1.13 file.c,1.9,1.10 cell.h,1.6,1.7 cell.c,1.11,1.12 cache.h,1.14,1.15

From: [email-masked]
Date: Tue, 19 Aug 2003 14:37:12 +0100

Update of /home/cvs/afs/fs/afs
In directory phoenix.infradead.org:/tmp/cvs-serv1024/fs/afs

Modified Files:
	volume.h volume.c vnode.h vnode.c vlocation.c internal.h 
	inode.c file.c cell.h cell.c cache.h 
Log Message:
made the CacheFS interface functions always present in cachefs.h, even if
CONFIG_CACHEFS is not set

Index: volume.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/volume.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- volume.h	15 Aug 2003 14:16:56 -0000	1.7
+++ volume.h	19 Aug 2003 13:37:08 -0000	1.8
@@ -16,6 +16,7 @@
 #include "fsclient.h"
 #include "kafstimod.h"
 #include "kafsasyncd.h"
+#include "cache.h"
 
 #define __packed __attribute__((packed))
 
@@ -26,8 +27,6 @@
 	AFS_VLUPD_BUSYSLEEP,		/* sleeping because server returned EBUSY */
 	
 } __attribute__((packed)) afs_vlocation_upd_t;
-
-typedef uint8_t afs_cache_vtype_t;
 
 /*****************************************************************************/
 /*

Index: volume.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/volume.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- volume.c	15 Aug 2003 14:16:56 -0000	1.10
+++ volume.c	19 Aug 2003 13:37:08 -0000	1.11
@@ -18,6 +18,7 @@
 #include "volume.h"
 #include "vnode.h"
 #include "cell.h"
+#include "cache.h"
 #include "cmservice.h"
 #include "fsclient.h"
 #include "vlclient.h"

Index: vnode.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/vnode.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vnode.h	15 Aug 2003 14:16:56 -0000	1.6
+++ vnode.h	19 Aug 2003 13:37:08 -0000	1.7
@@ -16,6 +16,7 @@
 #include <linux/version.h>
 #include "server.h"
 #include "kafstimod.h"
+#include "cache.h"
 
 #ifdef __KERNEL__

Index: vnode.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/vnode.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vnode.c	15 Aug 2003 14:16:56 -0000	1.9
+++ vnode.c	19 Aug 2003 13:37:08 -0000	1.10
@@ -21,6 +21,7 @@
 #include "fsclient.h"
 #include "vlclient.h"
 #include "vnode.h"
+#include "cache.h"
 #include "internal.h"
 
 static void afs_vnode_cb_timed_out(struct afs_timer *timer);

Index: vlocation.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/vlocation.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vlocation.c	15 Aug 2003 14:16:56 -0000	1.12
+++ vlocation.c	19 Aug 2003 13:37:08 -0000	1.13
@@ -21,6 +21,7 @@
 #include "fsclient.h"
 #include "vlclient.h"
 #include "kafstimod.h"
+#include "cache.h"
 #include <rxrpc/connection.h>
 #include "internal.h"

Index: internal.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/internal.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- internal.h	15 Aug 2003 14:16:56 -0000	1.17
+++ internal.h	19 Aug 2003 13:37:08 -0000	1.18
@@ -18,10 +18,6 @@
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 
-#ifdef AFS_CACHING_SUPPORT
-#include <linux/cachefs.h>
-#endif
-
 /*
  * debug tracing
  */

Index: inode.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/inode.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- inode.c	15 Aug 2003 14:16:56 -0000	1.12
+++ inode.c	19 Aug 2003 13:37:08 -0000	1.13
@@ -23,6 +23,7 @@
 #include "volume.h"
 #include "vnode.h"
 #include "super.h"
+#include "cache.h"
 #include "internal.h"
 
 struct afs_iget_data {

Index: file.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/file.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- file.c	15 Aug 2003 14:16:56 -0000	1.9
+++ file.c	19 Aug 2003 13:37:08 -0000	1.10
@@ -19,6 +19,7 @@
 #include <linux/buffer_head.h>
 #include "volume.h"
 #include "vnode.h"
+#include "cache.h"
 #include <rxrpc/call.h>
 #include "internal.h"

Index: cell.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/cell.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cell.h	15 Aug 2003 14:16:56 -0000	1.6
+++ cell.h	19 Aug 2003 13:37:08 -0000	1.7
@@ -13,6 +13,7 @@
 #define _LINUX_AFS_CELL_H
 
 #include "types.h"
+#include "cache.h"
 
 #define AFS_CELL_MAX_ADDRS 15

Index: cell.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/cell.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cell.c	15 Aug 2003 14:16:56 -0000	1.11
+++ cell.c	19 Aug 2003 13:37:08 -0000	1.12
@@ -21,6 +21,7 @@
 #include "vlclient.h"
 #include "kafstimod.h"
 #include "super.h"
+#include "cache.h"
 #include "internal.h"
 
 DECLARE_RWSEM(afs_proc_cells_sem);

Index: cache.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/cache.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cache.h	15 Aug 2003 14:16:56 -0000	1.14
+++ cache.h	19 Aug 2003 13:37:08 -0000	1.15
@@ -12,6 +12,8 @@
 #ifndef _LINUX_AFS_CACHE_H
 #define _LINUX_AFS_CACHE_H
 
+#define AFS_CACHING_SUPPORT
+
 #include <linux/version.h>
 #include <linux/mm.h>
 #ifdef AFS_CACHING_SUPPORT