]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'work.copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jan 2016 00:30:34 +0000 (16:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jan 2016 00:30:34 +0000 (16:30 -0800)
commitfce205e9da8e063aa1cf3d6583c1a9ed2b82f3f0
tree1c0ae581b71a2737e2bc2d94536f1e39266f3638
parent065019a38feab5f2659cbd44080d528f8dff0b00
parent2b3909f8a7fe94e0234850aa9d120cca15b6e1f7
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
fs/btrfs/file.c
fs/cifs/cifsfs.c
fs/cifs/cifsfs.h
fs/compat_ioctl.c
fs/ioctl.c
fs/locks.c
include/linux/fs.h