diff options
| author | Dmitry Torokhov | 2016-12-16 18:31:17 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2016-12-16 18:31:17 +0100 |
| commit | f26e8817b235d8764363bffcc9cbfc61867371f2 (patch) | |
| tree | 6546ea2cf91b78f1ada2161db61e21085c880740 /fs/nfs/nfs42.h | |
| parent | Input: change KEY_DATA from 0x275 to 0x277 (diff) | |
| parent | Merge branch 'synaptics-rmi4' into next (diff) | |
| download | kernel-qcow2-linux-f26e8817b235d8764363bffcc9cbfc61867371f2.tar.gz kernel-qcow2-linux-f26e8817b235d8764363bffcc9cbfc61867371f2.tar.xz kernel-qcow2-linux-f26e8817b235d8764363bffcc9cbfc61867371f2.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.10 merge window.
Diffstat (limited to 'fs/nfs/nfs42.h')
| -rw-r--r-- | fs/nfs/nfs42.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs42.h b/fs/nfs/nfs42.h index b587ccd31083..b6cd15314bab 100644 --- a/fs/nfs/nfs42.h +++ b/fs/nfs/nfs42.h @@ -13,6 +13,7 @@ /* nfs4.2proc.c */ int nfs42_proc_allocate(struct file *, loff_t, loff_t); +ssize_t nfs42_proc_copy(struct file *, loff_t, struct file *, loff_t, size_t); int nfs42_proc_deallocate(struct file *, loff_t, loff_t); loff_t nfs42_proc_llseek(struct file *, loff_t, int); int nfs42_proc_layoutstats_generic(struct nfs_server *, |