diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-16 13:30:09 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-16 13:30:09 +0300 |
| commit | e7d9facf0bab6d919342fea17c8cc0f65f8a0fe9 (patch) | |
| tree | 8301035b4dcb273c211c04fe2c0d1cbaf897021b /include/linux/coda_psdev.h | |
| parent | 28bcd199cc4465733c1ac0c70135a385fff97c71 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
Merge tag 'v3.7-rc1'
Merge Linux 3.7-rc1 to get latest upstream changes.
Diffstat (limited to 'include/linux/coda_psdev.h')
| -rw-r--r-- | include/linux/coda_psdev.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h index 72f2d2f0af91..8031d6eef102 100644 --- a/include/linux/coda_psdev.h +++ b/include/linux/coda_psdev.h @@ -1,14 +1,9 @@ #ifndef __CODA_PSDEV_H #define __CODA_PSDEV_H -#include <linux/magic.h> - -#define CODA_PSDEV_MAJOR 67 -#define MAX_CODADEVS 5 /* how many do we allow */ - -#ifdef __KERNEL__ #include <linux/backing-dev.h> #include <linux/mutex.h> +#include <uapi/linux/coda_psdev.h> struct kstatfs; @@ -74,23 +69,4 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs); */ extern struct venus_comm coda_comms[]; -#endif /* __KERNEL__ */ - -/* 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 - #endif |