coda: move internal defs out of include/linux/ [ver #2]

Move include/linux/coda_psdev.h to fs/coda/ as there's nothing else that
uses it.

Link: http://lkml.kernel.org/r/3ceeee0415a929b89fb02700b6b4b3a07938acb8.1558117389.git.jaharkes@cs.cmu.edu
Link: https://patchwork.kernel.org/patch/10590257/
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Yann Droneaud <ydroneaud@opteya.com>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Sam Protsenko <semen.protsenko@linaro.org>
Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/coda/cache.c b/fs/coda/cache.c
index 201fc08..3b8c451 100644 (file)
--- a/fs/coda/cache.c
+++ b/fs/coda/cache.c
@@ -21,7 +21,7 @@
 #include <linux/spinlock.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 #include "coda_cache.h"
 

diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
index 845b5a6..2e5badf 100644 (file)
--- a/fs/coda/cnode.c
+++ b/fs/coda/cnode.c
@@ -8,8 +8,8 @@
 #include <linux/time.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
 #include <linux/pagemap.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 
 static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2)

diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c
index e4b5f02..2e1a5a1 100644 (file)
--- a/fs/coda/coda_linux.c
+++ b/fs/coda/coda_linux.c
@@ -18,7 +18,7 @@
 #include <linux/string.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 
 /* initialize the debugging variables */

diff --git a/include/linux/coda_psdev.h b/fs/coda/coda_psdev.h
similarity index 79%
rename from include/linux/coda_psdev.h
rename to fs/coda/coda_psdev.h
index 9487f79..012e16f 100644 (file)
--- a/include/linux/coda_psdev.h
+++ b/fs/coda/coda_psdev.h
@@ -4,21 +4,10 @@
 
 #include <linux/backing-dev.h>
 #include <linux/mutex.h>
-#include <uapi/linux/coda_psdev.h>
+#include <linux/coda_psdev.h>
 
 struct kstatfs;
 
-/* communication pending/processing queues */
-struct venus_comm {
-       u_long              vc_seq;
-       wait_queue_head_t   vc_waitq; /* Venus wait queue */
-       struct list_head    vc_pending;
-       struct list_head    vc_processing;
-       int                 vc_inuse;
-       struct super_block *vc_sb;
-       struct mutex        vc_mutex;
-};
-
 /* messages between coda filesystem in kernel and Venus */
 struct upc_req {
        struct list_head        uc_chain;
@@ -36,6 +25,17 @@ struct upc_req {
 #define CODA_REQ_WRITE  0x4
 #define CODA_REQ_ABORT  0x8
 
+/* communication pending/processing queues */
+struct venus_comm {
+       u_long              vc_seq;
+       wait_queue_head_t   vc_waitq; /* Venus wait queue */
+       struct list_head    vc_pending;
+       struct list_head    vc_processing;
+       int                 vc_inuse;
+       struct super_block *vc_sb;
+       struct mutex        vc_mutex;
+};
+
 static inline struct venus_comm *coda_vcp(struct super_block *sb)
 {
        return (struct venus_comm *)((sb)->s_fs_info);
@@ -46,30 +46,30 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);
 int venus_getattr(struct super_block *sb, struct CodaFid *fid,
                  struct coda_vattr *attr);
 int venus_setattr(struct super_block *, struct CodaFid *, struct coda_vattr *);
-int venus_lookup(struct super_block *sb, struct CodaFid *fid, 
-                const char *name, int length, int *type, 
+int venus_lookup(struct super_block *sb, struct CodaFid *fid,
+                const char *name, int length, int *type,
                 struct CodaFid *resfid);
 int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
                kuid_t uid);
 int venus_open(struct super_block *sb, struct CodaFid *fid, int flags,
               struct file **f);
-int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid, 
-               const char *name, int length, 
+int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
+               const char *name, int length,
                struct CodaFid *newfid, struct coda_vattr *attrs);
-int venus_create(struct super_block *sb, struct CodaFid *dirfid, 
+int venus_create(struct super_block *sb, struct CodaFid *dirfid,
                 const char *name, int length, int excl, int mode,
-                struct CodaFid *newfid, struct coda_vattr *attrs) ;
-int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid, 
+                struct CodaFid *newfid, struct coda_vattr *attrs);
+int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid,
                const char *name, int length);
-int venus_remove(struct super_block *sb, struct CodaFid *dirfid, 
+int venus_remove(struct super_block *sb, struct CodaFid *dirfid,
                 const char *name, int length);
-int venus_readlink(struct super_block *sb, struct CodaFid *fid, 
+int venus_readlink(struct super_block *sb, struct CodaFid *fid,
                   char *buffer, int *length);
-int venus_rename(struct super_block *, struct CodaFid *new_fid, 
-                struct CodaFid *old_fid, size_t old_length, 
-                size_t new_length, const char *old_name, 
+int venus_rename(struct super_block *sb, struct CodaFid *new_fid,
+                struct CodaFid *old_fid, size_t old_length,
+                size_t new_length, const char *old_name,
                 const char *new_name);
-int venus_link(struct super_block *sb, struct CodaFid *fid, 
+int venus_link(struct super_block *sb, struct CodaFid *fid,
                  struct CodaFid *dirfid, const char *name, int len );
 int venus_symlink(struct super_block *sb, struct CodaFid *fid,
                  const char *name, int len, const char *symname, int symlen);

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 7e103eb..716a0b9 100644 (file)
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -23,7 +23,7 @@
 #include <linux/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 #include "coda_cache.h"
 

diff --git a/fs/coda/file.c b/fs/coda/file.c
index 43d3715..a6b32c8 100644 (file)
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -22,8 +22,7 @@
 #include <linux/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
-
+#include "coda_psdev.h"
 #include "coda_linux.h"
 #include "coda_int.h"
 

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 23f6ebd..96d832e 100644 (file)
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -27,7 +27,7 @@
 #include <linux/vmalloc.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 #include "coda_cache.h"
 

diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
index e0c17b7..644d48c 100644 (file)
--- a/fs/coda/pioctl.c
+++ b/fs/coda/pioctl.c
@@ -20,8 +20,7 @@
 #include <linux/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
-
+#include "coda_psdev.h"
 #include "coda_linux.h"
 
 /* pioctl ops */

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index e80bda1..0a61e94 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -38,8 +38,7 @@
 #include <linux/uaccess.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
-
+#include "coda_psdev.h"
 #include "coda_linux.h"
 
 #include "coda_int.h"

diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
index 202297d..8907d05 100644 (file)
--- a/fs/coda/symlink.c
+++ b/fs/coda/symlink.c
@@ -17,8 +17,7 @@
 #include <linux/pagemap.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
-
+#include "coda_psdev.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 1e2f507..eb8cc30 100644 (file)
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -33,7 +33,7 @@
 #include <linux/vfs.h>
 
 #include <linux/coda.h>
-#include <linux/coda_psdev.h>
+#include "coda_psdev.h"
 #include "coda_linux.h"
 #include "coda_cache.h"