[PATCH v4 76/79] coda_psdev.h: move upc_req definition from uapi to kernel side headers
From: Mikko Rapeli <hidden>
Date: 2015-10-15 06:28:24
Also in:
lkml
Subsystem:
coda file system, the rest · Maintainers:
Jan Harkes, Linus Torvalds
Only users of upc_req in kernel side fs/coda/psdev.c and fs/coda/upcall.c
already include linux/coda_psdev.h.
Suggested by Jan Harkes [off-list ref] on lkml message
[off-list ref].
Fixes these include/uapi/linux/coda_psdev.h compilation errors in userspace:
./linux/coda_psdev.h:12:19: error: field ‘uc_chain’ has incomplete type
struct list_head uc_chain;
^
./linux/coda_psdev.h:13:2: error: unknown type name ‘caddr_t’
caddr_t uc_data;
^
./linux/coda_psdev.h:14:2: error: unknown type name ‘u_short’
u_short uc_flags;
^
./linux/coda_psdev.h:15:2: error: unknown type name ‘u_short’
u_short uc_inSize; /* Size is at most 5000 bytes */
^
./linux/coda_psdev.h:16:2: error: unknown type name ‘u_short’
u_short uc_outSize;
^
./linux/coda_psdev.h:17:2: error: unknown type name ‘u_short’
u_short uc_opcode; /* copied from data to save lookup */
^
./linux/coda_psdev.h:19:2: error: unknown type name ‘wait_queue_head_t’
wait_queue_head_t uc_sleep; /* process' wait queue */
^
Signed-off-by: Mikko Rapeli <redacted>
---
include/linux/coda_psdev.h | 11 +++++++++++
include/uapi/linux/coda_psdev.h | 13 -------------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 5b8721e..b3c0830 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h@@ -19,6 +19,17 @@ struct venus_comm { 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 */ +}; static inline struct venus_comm *coda_vcp(struct super_block *sb) {
diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h
index 79d0598..e2c44d2 100644
--- a/include/uapi/linux/coda_psdev.h
+++ b/include/uapi/linux/coda_psdev.h@@ -6,19 +6,6 @@ #define CODA_PSDEV_MAJOR 67 #define MAX_CODADEVS 5 /* how many do we allow */ - -/* 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
--
2.5.0