diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 16:30:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 16:30:34 -0800 |
| commit | fce205e9da8e063aa1cf3d6583c1a9ed2b82f3f0 (patch) | |
| tree | 1c0ae581b71a2737e2bc2d94536f1e39266f3638 /fs/cifs/cifsfs.h | |
| parent | 065019a38feab5f2659cbd44080d528f8dff0b00 (diff) | |
| parent | 2b3909f8a7fe94e0234850aa9d120cca15b6e1f7 (diff) | |
| download | linux-fce205e9da8e063aa1cf3d6583c1a9ed2b82f3f0.tar.bz2 | |
Merge branch 'work.copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs copy_file_range updates from Al Viro:
"Several series around copy_file_range/CLONE"
* 'work.copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
btrfs: use new dedupe data function pointer
vfs: hoist the btrfs deduplication ioctl to the vfs
vfs: wire up compat ioctl for CLONE/CLONE_RANGE
cifs: avoid unused variable and label
nfsd: implement the NFSv4.2 CLONE operation
nfsd: Pass filehandle to nfs4_preprocess_stateid_op()
vfs: pull btrfs clone API to vfs layer
locks: new locks_mandatory_area calling convention
vfs: Add vfs_copy_file_range() support for pagecache copies
btrfs: add .copy_file_range file operation
x86: add sys_copy_file_range to syscall tables
vfs: add copy_file_range syscall and vfs helper
Diffstat (limited to 'fs/cifs/cifsfs.h')
| -rw-r--r-- | fs/cifs/cifsfs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 26a1187d4323..68c4547528c4 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -130,7 +130,6 @@ extern int cifs_setxattr(struct dentry *, const char *, const void *, extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); - #ifdef CONFIG_CIFS_NFSD_EXPORT extern const struct export_operations cifs_export_ops; #endif /* CONFIG_CIFS_NFSD_EXPORT */ |