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 201fc08a8b4fd087e1a35a8548fafabcbd9034c3..3b8c4513118f4870afdaf3e7f5751d009d5953b5 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 845b5a66952a381ea47ffae5f3c2709af1be9d73..2e5badf67f98726f71adab0db2710417f8426a38 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 e4b5f02f0dd41dbaf54b507678ef39a61550d718..2e1a5a192074da9b95e7868259cb20a189b36a90 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/fs/coda/coda_psdev.h b/fs/coda/coda_psdev.h
new file mode 100644 (file)
index 0000000..012e16f
--- /dev/null
+++ b/fs/coda/coda_psdev.h
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __CODA_PSDEV_H
+#define __CODA_PSDEV_H
+
+#include <linux/backing-dev.h>
+#include <linux/mutex.h>
+#include <linux/coda_psdev.h>
+
+struct kstatfs;
+
+/* messages between coda filesystem in kernel and Venus */
+struct upc_req {
+       struct list_head        uc_chain;
+       caddr_t                 uc_data;
+       u_short                 uc_flags;
+       u_short                 uc_inSize;  /* Size is at most 5000 bytes */
+       u_short                 uc_outSize;
+       u_short                 uc_opcode;  /* copied from data to save lookup */
+       int                     uc_unique;
+       wait_queue_head_t       uc_sleep;   /* process' wait queue */
+};
+
+#define CODA_REQ_ASYNC  0x1
+#define CODA_REQ_READ   0x2
+#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);
+}
+
+/* upcalls */
+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,
+                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,
+               struct CodaFid *newfid, struct coda_vattr *attrs);
+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,
+               const char *name, int length);
+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,
+                  char *buffer, int *length);
+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,
+                 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);
+int venus_access(struct super_block *sb, struct CodaFid *fid, int mask);
+int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
+                unsigned int cmd, struct PioctlData *data);
+int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out,
+                 size_t nbytes);
+int venus_fsync(struct super_block *sb, struct CodaFid *fid);
+int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
+
+/*
+ * Statistics
+ */
+
+extern struct venus_comm coda_comms[];
+#endif

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 7e103eb8ffcd637490d32ce50919f1c3325eb7cb..716a0b932ec0763fe2b0803241d00c09f6c3222a 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 43d371551d2b1f571e0a1a87f9ac340d45e0d189..a6b32c883a50e88bf534be9305680f0f6bb162e0 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 23f6ebd08e801536213e928e2aa84b481491304f..96d832ed23b5edb3d61e6d22f8d4ebc8f985c87f 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 e0c17b7dccce626858f3c588a03a42c975ab15bd..644d48c12ce827cd36a44828ac377aecdb41bfcb 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 e80bda1de6c5cc98cdcda109b2322bf71859bc5f..0a61e949a430ba97d2ad38385dbc32bf80c066ac 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 202297d156dff6c5b166cd1cefb72b2387d744c1..8907d0508198845f15499ca230743acf011f9c34 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 1e2f5072210711b3decc4d59d41da60c520486a3..eb8cc30f25898b79742da7355acc92c41151ffc0 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"
 

diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
deleted file mode 100644 (file)
index 9487f79..0000000
--- a/include/linux/coda_psdev.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __CODA_PSDEV_H
-#define __CODA_PSDEV_H
-
-#include <linux/backing-dev.h>
-#include <linux/mutex.h>
-#include <uapi/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;
-       caddr_t                 uc_data;
-       u_short                 uc_flags;
-       u_short                 uc_inSize;  /* Size is at most 5000 bytes */
-       u_short                 uc_outSize;
-       u_short                 uc_opcode;  /* copied from data to save lookup */
-       int                     uc_unique;
-       wait_queue_head_t       uc_sleep;   /* process' wait queue */
-};
-
-#define CODA_REQ_ASYNC  0x1
-#define CODA_REQ_READ   0x2
-#define CODA_REQ_WRITE  0x4
-#define CODA_REQ_ABORT  0x8
-
-static inline struct venus_comm *coda_vcp(struct super_block *sb)
-{
-       return (struct venus_comm *)((sb)->s_fs_info);
-}
-
-/* upcalls */
-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, 
-                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, 
-               struct CodaFid *newfid, struct coda_vattr *attrs);
-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, 
-               const char *name, int length);
-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, 
-                  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, 
-                const char *new_name);
-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);
-int venus_access(struct super_block *sb, struct CodaFid *fid, int mask);
-int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
-                unsigned int cmd, struct PioctlData *data);
-int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out,
-                 size_t nbytes);
-int venus_fsync(struct super_block *sb, struct CodaFid *fid);
-int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
-
-/*
- * Statistics
- */
-
-extern struct venus_comm coda_comms[];
-#endif