diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
| commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
| tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /fs/ioctl.c | |
| parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
| parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) | |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ioctl.c')
| -rw-r--r-- | fs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c index 3212c29235ce..2005529af560 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -230,7 +230,7 @@ static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd, | |||
| 230 | ret = -EXDEV; | 230 | ret = -EXDEV; |
| 231 | if (src_file.file->f_path.mnt != dst_file->f_path.mnt) | 231 | if (src_file.file->f_path.mnt != dst_file->f_path.mnt) |
| 232 | goto fdput; | 232 | goto fdput; |
| 233 | ret = do_clone_file_range(src_file.file, off, dst_file, destoff, olen); | 233 | ret = vfs_clone_file_range(src_file.file, off, dst_file, destoff, olen); |
| 234 | fdput: | 234 | fdput: |
| 235 | fdput(src_file); | 235 | fdput(src_file); |
| 236 | return ret; | 236 | return ret; |
