diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:58:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:58:04 -0400 |
commit | 57a8ec387e1441ea5e1232bc0749fb99a8cba7e7 (patch) | |
tree | b5fb03fc6bc5754de8b5b1f8b0e4f36d67c8315c /include/linux/coda_psdev.h | |
parent | 0a8ad0ffa4d80a544f6cbff703bf6394339afcdf (diff) | |
parent | 43e11fa2d1d3b6e35629fa556eb7d571edba2010 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
"VM:
- z3fold fixes and enhancements by Henry Burns and Vitaly Wool
- more accurate reclaimed slab caches calculations by Yafang Shao
- fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by
Christoph Hellwig
- !CONFIG_MMU fixes by Christoph Hellwig
- new novmcoredd parameter to omit device dumps from vmcore, by
Kairui Song
- new test_meminit module for testing heap and pagealloc
initialization, by Alexander Potapenko
- ioremap improvements for huge mappings, by Anshuman Khandual
- generalize kprobe page fault handling, by Anshuman Khandual
- device-dax hotplug fixes and improvements, by Pavel Tatashin
- enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V
- add pte_devmap() support for arm64, by Robin Murphy
- unify locked_vm accounting with a helper, by Daniel Jordan
- several misc fixes
core/lib:
- new typeof_member() macro including some users, by Alexey Dobriyan
- make BIT() and GENMASK() available in asm, by Masahiro Yamada
- changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better
code generation, by Alexey Dobriyan
- rbtree code size optimizations, by Michel Lespinasse
- convert struct pid count to refcount_t, by Joel Fernandes
get_maintainer.pl:
- add --no-moderated switch to skip moderated ML's, by Joe Perches
misc:
- ptrace PTRACE_GET_SYSCALL_INFO interface
- coda updates
- gdb scripts, various"
[ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ]
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
fs/select.c: use struct_size() in kmalloc()
mm: add account_locked_vm utility function
arm64: mm: implement pte_devmap support
mm: introduce ARCH_HAS_PTE_DEVMAP
mm: clean up is_device_*_page() definitions
mm/mmap: move common defines to mman-common.h
mm: move MAP_SYNC to asm-generic/mman-common.h
device-dax: "Hotremove" persistent memory that is used like normal RAM
mm/hotplug: make remove_memory() interface usable
device-dax: fix memory and resource leak if hotplug fails
include/linux/lz4.h: fix spelling and copy-paste errors in documentation
ipc/mqueue.c: only perform resource calculation if user valid
include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
scripts/gdb: add helpers to find and list devices
scripts/gdb: add lx-genpd-summary command
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
kernel/pid.c: convert struct pid count to refcount_t
drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining()
select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR
...
Diffstat (limited to 'include/linux/coda_psdev.h')
-rw-r--r-- | include/linux/coda_psdev.h | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h deleted file mode 100644 index 15170954aa2b..000000000000 --- a/include/linux/coda_psdev.h +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
2 | #ifndef __CODA_PSDEV_H | ||
3 | #define __CODA_PSDEV_H | ||
4 | |||
5 | #include <linux/backing-dev.h> | ||
6 | #include <linux/mutex.h> | ||
7 | #include <uapi/linux/coda_psdev.h> | ||
8 | |||
9 | struct kstatfs; | ||
10 | |||
11 | /* communication pending/processing queues */ | ||
12 | struct venus_comm { | ||
13 | u_long vc_seq; | ||
14 | wait_queue_head_t vc_waitq; /* Venus wait queue */ | ||
15 | struct list_head vc_pending; | ||
16 | struct list_head vc_processing; | ||
17 | int vc_inuse; | ||
18 | struct super_block *vc_sb; | ||
19 | struct mutex vc_mutex; | ||
20 | }; | ||
21 | |||
22 | |||
23 | static inline struct venus_comm *coda_vcp(struct super_block *sb) | ||
24 | { | ||
25 | return (struct venus_comm *)((sb)->s_fs_info); | ||
26 | } | ||
27 | |||
28 | /* upcalls */ | ||
29 | int venus_rootfid(struct super_block *sb, struct CodaFid *fidp); | ||
30 | int venus_getattr(struct super_block *sb, struct CodaFid *fid, | ||
31 | struct coda_vattr *attr); | ||
32 | int venus_setattr(struct super_block *, struct CodaFid *, struct coda_vattr *); | ||
33 | int venus_lookup(struct super_block *sb, struct CodaFid *fid, | ||
34 | const char *name, int length, int *type, | ||
35 | struct CodaFid *resfid); | ||
36 | int venus_close(struct super_block *sb, struct CodaFid *fid, int flags, | ||
37 | kuid_t uid); | ||
38 | int venus_open(struct super_block *sb, struct CodaFid *fid, int flags, | ||
39 | struct file **f); | ||
40 | int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid, | ||
41 | const char *name, int length, | ||
42 | struct CodaFid *newfid, struct coda_vattr *attrs); | ||
43 | int venus_create(struct super_block *sb, struct CodaFid *dirfid, | ||
44 | const char *name, int length, int excl, int mode, | ||
45 | struct CodaFid *newfid, struct coda_vattr *attrs) ; | ||
46 | int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid, | ||
47 | const char *name, int length); | ||
48 | int venus_remove(struct super_block *sb, struct CodaFid *dirfid, | ||
49 | const char *name, int length); | ||
50 | int venus_readlink(struct super_block *sb, struct CodaFid *fid, | ||
51 | char *buffer, int *length); | ||
52 | int venus_rename(struct super_block *, struct CodaFid *new_fid, | ||
53 | struct CodaFid *old_fid, size_t old_length, | ||
54 | size_t new_length, const char *old_name, | ||
55 | const char *new_name); | ||
56 | int venus_link(struct super_block *sb, struct CodaFid *fid, | ||
57 | struct CodaFid *dirfid, const char *name, int len ); | ||
58 | int venus_symlink(struct super_block *sb, struct CodaFid *fid, | ||
59 | const char *name, int len, const char *symname, int symlen); | ||
60 | int venus_access(struct super_block *sb, struct CodaFid *fid, int mask); | ||
61 | int venus_pioctl(struct super_block *sb, struct CodaFid *fid, | ||
62 | unsigned int cmd, struct PioctlData *data); | ||
63 | int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out); | ||
64 | int venus_fsync(struct super_block *sb, struct CodaFid *fid); | ||
65 | int venus_statfs(struct dentry *dentry, struct kstatfs *sfs); | ||
66 | |||
67 | /* | ||
68 | * Statistics | ||
69 | */ | ||
70 | |||
71 | extern struct venus_comm coda_comms[]; | ||
72 | #endif | ||