Move intermezzo header files to its own private directory

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

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;
 

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) 
 {

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>

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
  */

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)
 {

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 *);
 

include/linux/intermezzo_fs.h → 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__

include/linux/intermezzo_kml.h → 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

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;

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)
 

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)
 

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
 

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)
 

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)
 

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
 

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)
 {

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,

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)

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)
 {

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) 
 {

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 ()

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;

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)
 {

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

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

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;

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 */
 

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:

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>