take coda-private headers out of include/linux

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index 505f19607542d5a328aebb1b06a331abbd967744..4b12abcb2ad3cf0eba636dd78c4848521bf9fc28 100644 (file)
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -150,7 +150,7 @@ NBD_REPLY_MAGIC       0x96744668  nbd_reply         include/linux/nbd.h
 STL_BOARDMAGIC        0xa2267f52  stlbrd            include/linux/stallion.h
 ENI155_MAGIC          0xa54b872d  midway_eprom     drivers/atm/eni.h
 SCI_MAGIC             0xbabeface  gs_port           drivers/char/sh-sci.h
-CODA_MAGIC            0xC0DAC0DA  coda_file_info    include/linux/coda_fs_i.h
+CODA_MAGIC            0xC0DAC0DA  coda_file_info    fs/coda/coda_fs_i.h
 DPMEM_MAGIC           0xc0ffee11  gdt_pci_sram      drivers/scsi/gdth.h
 STLI_PORTMAGIC        0xe671c7a1  stliport          include/linux/istallion.h
 YAM_MAGIC             0xF10A7654  yam_port          drivers/net/hamradio/yam.c

diff --git a/fs/coda/cache.c b/fs/coda/cache.c
index 5525e1c660fd55057825fedd7ebe175dae6fe55a..6901578761841ae6c0ed950c26de2cf64c9d1389 100644 (file)
--- a/fs/coda/cache.c
+++ b/fs/coda/cache.c
@@ -20,10 +20,9 @@
 #include <linux/spinlock.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda_cache.h>
+#include "coda_linux.h"
+#include "coda_cache.h"
 
 static atomic_t permission_epoch = ATOMIC_INIT(0);
 

diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
index 602240569c89ace556721e0f4d9c954bfd27c491..6475877b07632cda1af59664e629aa5ab92d958b 100644 (file)
--- a/fs/coda/cnode.c
+++ b/fs/coda/cnode.c
@@ -7,9 +7,8 @@
 #include <linux/time.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
-#include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
+#include "coda_linux.h"
 
 static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2)
 {

diff --git a/include/linux/coda_cache.h b/fs/coda/coda_cache.h
similarity index 100%
rename from include/linux/coda_cache.h
rename to fs/coda/coda_cache.h

diff --git a/include/linux/coda_fs_i.h b/fs/coda/coda_fs_i.h
similarity index 100%
rename from include/linux/coda_fs_i.h
rename to fs/coda/coda_fs_i.h

diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c
index bf4a3fd3c8e33a910f0ab7ae638a4b66d06f08e5..2bdbcc11b373abf28505c30f472bd9d77ec11428 100644 (file)
--- a/fs/coda/coda_linux.c
+++ b/fs/coda/coda_linux.c
@@ -17,9 +17,8 @@
 #include <linux/string.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_fs_i.h>
+#include "coda_linux.h"
 
 /* initialize the debugging variables */
 int coda_fake_statfs;

diff --git a/include/linux/coda_linux.h b/fs/coda/coda_linux.h
similarity index 99%
rename from include/linux/coda_linux.h
rename to fs/coda/coda_linux.h
index 490c56b408647834af5bbf914759b0aa0ffee125..9b0c5323890b7d9f0968c672ca79bf1dd3aae81a 100644 (file)
--- a/include/linux/coda_linux.h
+++ b/fs/coda/coda_linux.h
@@ -20,7 +20,7 @@
 #include <linux/wait.h>                
 #include <linux/types.h>
 #include <linux/fs.h>
-#include <linux/coda_fs_i.h>
+#include "coda_fs_i.h"
 
 /* operations */
 extern const struct inode_operations coda_dir_inode_operations;

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 9df71f0eb218b6c72fd65f846e63088a135cc193..2b8dae4d121ee5ad7d42ff879ce1a7c496d295f0 100644 (file)
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -23,10 +23,9 @@
 #include <asm/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda_cache.h>
+#include "coda_linux.h"
+#include "coda_cache.h"
 
 #include "coda_int.h"
 

diff --git a/fs/coda/file.c b/fs/coda/file.c
index c8b50ba4366a3a2aa0531ea61037ac9615edaaa0..0433057be3305c083fc4a705dfd5fcfbd857e2c0 100644 (file)
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -21,10 +21,9 @@
 #include <asm/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
-#include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
 
+#include "coda_linux.h"
 #include "coda_int.h"
 
 static ssize_t

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index bd7fde2721a8b81739f9628bd699fd08b4e8d778..261d86f9caec1e35924a1febc664ded0a1a8148e 100644 (file)
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -28,10 +28,9 @@
 #include <linux/vmalloc.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda_cache.h>
+#include "coda_linux.h"
+#include "coda_cache.h"
 
 #include "coda_int.h"
 

diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
index 741f0bd03918e5eb6190c52da211b4dc0eb6ea02..6cbb3afb36dc2b28b9aa3f2b585c195330894699 100644 (file)
--- a/fs/coda/pioctl.c
+++ b/fs/coda/pioctl.c
@@ -19,10 +19,10 @@
 #include <asm/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
-#include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
 
+#include "coda_linux.h"
+
 /* pioctl ops */
 static int coda_ioctl_permission(struct inode *inode, int mask, unsigned int flags);
 static long coda_pioctl(struct file *filp, unsigned int cmd,

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 62647a8595e47e2efcef12bc772620102fb7eaf8..8f616e0e252c3b9ba66c9af8a1b6c8e27e4ccd7d 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -43,10 +43,10 @@
 #include <asm/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
-#include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
 
+#include "coda_linux.h"
+
 #include "coda_int.h"
 
 /* statistics */

diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
index af78f007a2b0565418bf94b7793e7927315d2953..ab94ef63caefed0767e8f2cccf6364038ca94825 100644 (file)
--- a/fs/coda/symlink.c
+++ b/fs/coda/symlink.c
@@ -16,9 +16,9 @@
 #include <linux/pagemap.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_fs_i.h>
+
+#include "coda_linux.h"
 
 static int coda_symlink_filler(struct file *file, struct page *page)
 {

diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index c3563cab9758423da3c90faa69ac6374a458855b..9727e0c525793354cee16b4ccb3df71598ddd843 100644 (file)
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -33,10 +33,9 @@
 #include <linux/vfs.h>
 
 #include <linux/coda.h>
-#include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda_cache.h>
+#include "coda_linux.h"
+#include "coda_cache.h"
 
 #include "coda_int.h"