Move intermezzo header files to its own private directory

35 files changed, 68 insertions, 66 deletions

diff --git a/fs/intermezzo/cache.c b/fs/intermezzo/cache.c
index 332a885741d8..78cbd5b7dca9 100644
--- a/fs/intermezzo/cache.c
+++ b/fs/intermezzo/cache.c
@@ -39,8 +39,8 @@
 #include <linux/blkdev.h>
 #include <linux/init.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 /*
    This file contains the routines associated with managing a
diff --git a/fs/intermezzo/dcache.c b/fs/intermezzo/dcache.c
index c661e23796e0..406b07529326 100644
--- a/fs/intermezzo/dcache.c
+++ b/fs/intermezzo/dcache.c
@@ -46,7 +46,7 @@
 #include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 
-#include <linux/intermezzo_fs.h>
+#include "intermezzo_fs.h"
 
 kmem_cache_t * presto_dentry_slab;
 
diff --git a/fs/intermezzo/dir.c b/fs/intermezzo/dir.c
index 2d962e7273b3..6a992fc9541d 100644
--- a/fs/intermezzo/dir.c
+++ b/fs/intermezzo/dir.c
@@ -45,8 +45,8 @@
 #define __NO_VERSION__
 #include <linux/module.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 static inline void presto_relock_sem(struct inode *dir) 
 {
diff --git a/fs/intermezzo/ext_attr.c b/fs/intermezzo/ext_attr.c
index 0e1d6859b068..d9c0d728a537 100644
--- a/fs/intermezzo/ext_attr.c
+++ b/fs/intermezzo/ext_attr.c
@@ -46,8 +46,8 @@
 #include <asm/segment.h>
 #include <linux/smp_lock.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #ifdef CONFIG_FS_EXT_ATTR
 #include <linux/ext_attr.h>
diff --git a/fs/intermezzo/file.c b/fs/intermezzo/file.c
index bd97dd1fa552..ddb139a86b37 100644
--- a/fs/intermezzo/file.c
+++ b/fs/intermezzo/file.c
@@ -50,9 +50,9 @@
 #define __NO_VERSION__
 #include <linux/module.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
 #include <linux/fsfilter.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 /*
  * these are initialized in super.c
  */
diff --git a/fs/intermezzo/fileset.c b/fs/intermezzo/fileset.c
index ecf22a153207..1e2b86f10925 100644
--- a/fs/intermezzo/fileset.c
+++ b/fs/intermezzo/fileset.c
@@ -43,8 +43,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 static inline struct presto_file_set *presto_dentry2fset(struct dentry *dentry)
 {
diff --git a/fs/intermezzo/inode.c b/fs/intermezzo/inode.c
index 20b7fd1c921b..83fb9196d97d 100644
--- a/fs/intermezzo/inode.c
+++ b/fs/intermezzo/inode.c
@@ -47,8 +47,8 @@
 #include <linux/vmalloc.h>
 #include <asm/segment.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 extern void presto_free_cache(struct presto_cache *);
 
diff --git a/include/linux/intermezzo_fs.h b/fs/intermezzo/intermezzo_fs.h
index f7a942ae2522..5a91c61188da 100644
--- a/include/linux/intermezzo_fs.h
+++ b/fs/intermezzo/intermezzo_fs.h
@@ -27,8 +27,8 @@
 #ifndef __INTERMEZZO_FS_H_
 #define __INTERMEZZO_FS_H_ 1
 
-#include <linux/intermezzo_lib.h>
-#include <linux/intermezzo_idl.h>
+#include "intermezzo_lib.h"
+#include "intermezzo_idl.h"
 
 
 #ifdef __KERNEL__
diff --git a/include/linux/intermezzo_idl.h b/fs/intermezzo/intermezzo_idl.h
index 4371b161d3b5..4371b161d3b5 100644
--- a/include/linux/intermezzo_idl.h
+++ b/fs/intermezzo/intermezzo_idl.h
diff --git a/include/linux/intermezzo_journal.h b/fs/intermezzo/intermezzo_journal.h
index 75ec0977e33d..75ec0977e33d 100644
--- a/include/linux/intermezzo_journal.h
+++ b/fs/intermezzo/intermezzo_journal.h
diff --git a/include/linux/intermezzo_kml.h b/fs/intermezzo/intermezzo_kml.h
index da11b5dcabdc..c545bbd79fde 100644
--- a/include/linux/intermezzo_kml.h
+++ b/fs/intermezzo/intermezzo_kml.h
@@ -2,9 +2,9 @@
 #define __INTERMEZZO_KML_H
 
 #include <linux/version.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_psdev.h"
 #include <linux/fs.h>
-#include <linux/intermezzo_journal.h>
+#include "intermezzo_journal.h"
 
 #define PRESTO_KML_MAJOR_VERSION 0x00010000
 #define PRESTO_KML_MINOR_VERSION 0x00002001
diff --git a/include/linux/intermezzo_lib.h b/fs/intermezzo/intermezzo_lib.h
index b84aa19208f8..b84aa19208f8 100644
--- a/include/linux/intermezzo_lib.h
+++ b/fs/intermezzo/intermezzo_lib.h
diff --git a/include/linux/intermezzo_psdev.h b/fs/intermezzo/intermezzo_psdev.h
index aa7fe70df356..aa7fe70df356 100644
--- a/include/linux/intermezzo_psdev.h
+++ b/fs/intermezzo/intermezzo_psdev.h
diff --git a/include/linux/intermezzo_upcall.h b/fs/intermezzo/intermezzo_upcall.h
index 0b3e6ff74e3a..0b3e6ff74e3a 100644
--- a/include/linux/intermezzo_upcall.h
+++ b/fs/intermezzo/intermezzo_upcall.h
diff --git a/fs/intermezzo/journal.c b/fs/intermezzo/journal.c
index 69a88caf1dc7..0b62b1364855 100644
--- a/fs/intermezzo/journal.c
+++ b/fs/intermezzo/journal.c
@@ -38,8 +38,9 @@
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 struct presto_reservation_data {
         unsigned int ri_recno;
diff --git a/fs/intermezzo/journal_ext2.c b/fs/intermezzo/journal_ext2.c
index 4fa5d5de0fc3..2adb47f8b676 100644
--- a/fs/intermezzo/journal_ext2.c
+++ b/fs/intermezzo/journal_ext2.c
@@ -33,8 +33,8 @@
 #include <linux/string.h>
 #include <linux/ext2_fs.h> 
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #if defined(CONFIG_EXT2_FS)
 
diff --git a/fs/intermezzo/journal_ext3.c b/fs/intermezzo/journal_ext3.c
index 6442f8ee185e..c5180c307b4d 100644
--- a/fs/intermezzo/journal_ext3.c
+++ b/fs/intermezzo/journal_ext3.c
@@ -44,8 +44,8 @@
 #include <linux/ext3_jbd.h>
 #endif
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #if defined(CONFIG_EXT3_FS) || defined (CONFIG_EXT3_FS_MODULE)
 
diff --git a/fs/intermezzo/journal_obdfs.c b/fs/intermezzo/journal_obdfs.c
index a30216b17c35..42f422851979 100644
--- a/fs/intermezzo/journal_obdfs.c
+++ b/fs/intermezzo/journal_obdfs.c
@@ -40,8 +40,8 @@
 #include /usr/src/obd/include/linux/obdfs.h
 #endif
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #ifdef CONFIG_OBDFS_FS
 
diff --git a/fs/intermezzo/journal_reiserfs.c b/fs/intermezzo/journal_reiserfs.c
index a504c1e9a33f..8ea2ec6bbe1e 100644
--- a/fs/intermezzo/journal_reiserfs.c
+++ b/fs/intermezzo/journal_reiserfs.c
@@ -43,8 +43,8 @@
 #include <linux/reiserfs_fs_i.h>
 #endif
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #if defined(CONFIG_REISERFS_FS) || defined(CONFIG_REISERFS_FS_MODULE)
 
diff --git a/fs/intermezzo/journal_tmpfs.c b/fs/intermezzo/journal_tmpfs.c
index ecd667b997c5..322da4af072a 100644
--- a/fs/intermezzo/journal_tmpfs.c
+++ b/fs/intermezzo/journal_tmpfs.c
@@ -46,8 +46,8 @@
 #endif
 #endif
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #if defined(CONFIG_TMPFS)
 
diff --git a/fs/intermezzo/journal_xfs.c b/fs/intermezzo/journal_xfs.c
index c89ca8959b80..c12d26552595 100644
--- a/fs/intermezzo/journal_xfs.c
+++ b/fs/intermezzo/journal_xfs.c
@@ -36,9 +36,9 @@
 #ifdef CONFIG_FS_XFS
 #include <linux/xfs_fs.h>
 #endif
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
-#include <linux/intermezzo_journal.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
+#include "intermezzo_journal.h"
 
 #if 0
 
diff --git a/fs/intermezzo/kml.c b/fs/intermezzo/kml.c
index 72221dfe6930..3c4fce7dfc71 100644
--- a/fs/intermezzo/kml.c
+++ b/fs/intermezzo/kml.c
@@ -5,10 +5,10 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_upcall.h>
-#include <linux/intermezzo_psdev.h>
-#include <linux/intermezzo_kml.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_upcall.h"
+#include "intermezzo_psdev.h"
+#include "intermezzo_kml.h"
 
 static struct presto_file_set * kml_getfset (char *path)
 {
diff --git a/fs/intermezzo/kml_decode.c b/fs/intermezzo/kml_decode.c
index c7fc1c3f3e99..7f2ea8a6a855 100644
--- a/fs/intermezzo/kml_decode.c
+++ b/fs/intermezzo/kml_decode.c
@@ -13,8 +13,8 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_kml.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_kml.h"
 
 static int size_round (int val);
 static int unpack_create (struct kml_create *rec, char *buf,
diff --git a/fs/intermezzo/kml_reint.c b/fs/intermezzo/kml_reint.c
index d666ae33b978..234bfb717507 100644
--- a/fs/intermezzo/kml_reint.c
+++ b/fs/intermezzo/kml_reint.c
@@ -34,8 +34,9 @@
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/mmu_context.h>
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 static void kmlreint_pre_secure(struct kml_rec *rec, struct file *dir,
                                 struct run_ctxt *saved)
diff --git a/fs/intermezzo/kml_setup.c b/fs/intermezzo/kml_setup.c
index c8ab345bfd63..e9207748975e 100644
--- a/fs/intermezzo/kml_setup.c
+++ b/fs/intermezzo/kml_setup.c
@@ -5,10 +5,10 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_upcall.h>
-#include <linux/intermezzo_psdev.h>
-#include <linux/intermezzo_kml.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_upcall.h"
+#include "intermezzo_psdev.h"
+#include "intermezzo_kml.h"
 
 int kml_init (struct presto_file_set *fset)
 {
diff --git a/fs/intermezzo/kml_unpack.c b/fs/intermezzo/kml_unpack.c
index f87d14cd61f1..d12a346b359e 100644
--- a/fs/intermezzo/kml_unpack.c
+++ b/fs/intermezzo/kml_unpack.c
@@ -56,9 +56,9 @@
 #  include <glib.h>
 #endif
 
-#include <linux/intermezzo_lib.h>
-#include <linux/intermezzo_idl.h>
-#include <linux/intermezzo_fs.h>
+#include "intermezzo_lib.h"
+#include "intermezzo_idl.h"
+#include "intermezzo_fs.h"
 
 int kml_unpack_version(struct presto_version **ver, char **buf, char *end) 
 {
diff --git a/fs/intermezzo/kml_utils.c b/fs/intermezzo/kml_utils.c
index 45f7735f33d0..ed0dd39b6d92 100644
--- a/fs/intermezzo/kml_utils.c
+++ b/fs/intermezzo/kml_utils.c
@@ -4,8 +4,8 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_kml.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_kml.h"
 
 
 // dlogit -- oppsite to logit ()
diff --git a/fs/intermezzo/methods.c b/fs/intermezzo/methods.c
index 1b0b29988f13..91dbd05a556c 100644
--- a/fs/intermezzo/methods.c
+++ b/fs/intermezzo/methods.c
@@ -46,7 +46,7 @@
 #include <linux/module.h>
 
 #include <linux/fsfilter.h>
-#include <linux/intermezzo_fs.h>
+#include "intermezzo_fs.h"
 
 
 int filter_print_entry = 0;
diff --git a/fs/intermezzo/presto.c b/fs/intermezzo/presto.c
index 3f0c3e33b5ca..76593ad45f53 100644
--- a/fs/intermezzo/presto.c
+++ b/fs/intermezzo/presto.c
@@ -37,8 +37,8 @@
 #include <linux/string.h>
 #include <linux/smp_lock.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 int presto_walk(const char *name, struct nameidata *nd)
 {
diff --git a/fs/intermezzo/psdev.c b/fs/intermezzo/psdev.c
index 9c442422adc6..3c25ec595ffe 100644
--- a/fs/intermezzo/psdev.c
+++ b/fs/intermezzo/psdev.c
@@ -51,8 +51,8 @@
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 
 #ifdef PRESTO_DEVEL
diff --git a/fs/intermezzo/replicator.c b/fs/intermezzo/replicator.c
index a198c3a173b0..ce49a00390f0 100644
--- a/fs/intermezzo/replicator.c
+++ b/fs/intermezzo/replicator.c
@@ -31,7 +31,8 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/fsfilter.h>
-#include <linux/intermezzo_fs.h>
+
+#include "intermezzo_fs.h"
 
 /*
  * this file contains a hash table of replicators/clients for a
diff --git a/fs/intermezzo/super.c b/fs/intermezzo/super.c
index cf076e8ead49..2324d561fa6a 100644
--- a/fs/intermezzo/super.c
+++ b/fs/intermezzo/super.c
@@ -47,8 +47,8 @@ static char rcsid[] __attribute ((unused)) = "$Id: super.c,v 1.4 2002/10/12 02:1
 #define __NO_VERSION__
 #include <linux/module.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #ifdef PRESTO_DEBUG
 long presto_vmemory = 0;
diff --git a/fs/intermezzo/sysctl.c b/fs/intermezzo/sysctl.c
index 074df7df544c..6674dd19257b 100644
--- a/fs/intermezzo/sysctl.c
+++ b/fs/intermezzo/sysctl.c
@@ -39,9 +39,8 @@
 #include <linux/utsname.h>
 #include <linux/blk.h>
 
-
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 /* /proc entries */
 
diff --git a/fs/intermezzo/upcall.c b/fs/intermezzo/upcall.c
index f96f073bcf12..7f9eac386b19 100644
--- a/fs/intermezzo/upcall.c
+++ b/fs/intermezzo/upcall.c
@@ -45,11 +45,11 @@
 #include <linux/vmalloc.h>
 #include <asm/segment.h>
 
-#include <linux/intermezzo_lib.h>
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_lib.h"
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
-#include <linux/intermezzo_idl.h>
+#include "intermezzo_idl.h"
 
 /*
   At present:
diff --git a/fs/intermezzo/vfs.c b/fs/intermezzo/vfs.c
index aa69825e97b8..b76693401d97 100644
--- a/fs/intermezzo/vfs.c
+++ b/fs/intermezzo/vfs.c
@@ -68,8 +68,8 @@
 #include <linux/namei.h>
 #include <linux/blk.h>
 
-#include <linux/intermezzo_fs.h>
-#include <linux/intermezzo_psdev.h>
+#include "intermezzo_fs.h"
+#include "intermezzo_psdev.h"
 
 #ifdef CONFIG_FS_EXT_ATTR
 # include <linux/ext_attr.h>