aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-12-16 16:21:05 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-12-16 16:21:05 -0500
commit3c55d6bcfe8163ff2b5636b4aabe3caa3f5d95f4 (patch)
tree3229c2de6e95352751d1c9e05dcd2925a3212beb /fs/btrfs/ioctl.c
parentMerge branch 'work.write_end' into for-linus (diff)
parentocfs2: implement the VFS clone_range, copy_range, and dedupe_range features (diff)
downloadlinux-dev-3c55d6bcfe8163ff2b5636b4aabe3caa3f5d95f4.tar.xz
linux-dev-3c55d6bcfe8163ff2b5636b4aabe3caa3f5d95f4.zip
Merge remote-tracking branch 'djwong/ocfs2-vfs-reflink-6' into for-linus
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 8270f4338b35..70eebc6c4c16 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3980,18 +3980,6 @@ out_unlock:
return ret;
}
-ssize_t btrfs_copy_file_range(struct file *file_in, loff_t pos_in,
- struct file *file_out, loff_t pos_out,
- size_t len, unsigned int flags)
-{
- ssize_t ret;
-
- ret = btrfs_clone_files(file_out, file_in, pos_in, len, pos_out);
- if (ret == 0)
- ret = len;
- return ret;
-}
-
int btrfs_clone_file_range(struct file *src_file, loff_t off,
struct file *dst_file, loff_t destoff, u64 len)
{