@@ -1293,7 +1293,7 @@ COMPAT_SYSCALL_DEFINE6(pwritev2, compat_ulong_t, fd,
#endif /* CONFIG_COMPAT */
static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
- size_t count, loff_t max)
+ size_t count, loff_t max, int flags)
{
struct inode *in_inode, *out_inode;
struct pipe_inode_info *opipe;
@@ -1398,13 +1398,13 @@ SYSCALL_DEFINE4(sendfile, int, out_fd, int, in_fd, off_t __user *, offset, size_
if (unlikely(get_user(off, offset)))
return -EFAULT;
pos = off;
- ret = do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS);
+ ret = do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS, 0);
if (unlikely(put_user(pos, offset)))
return -EFAULT;
return ret;
}
- return do_sendfile(out_fd, in_fd, NULL, count, 0);
+ return do_sendfile(out_fd, in_fd, NULL, count, 0, 0);
}
SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, loff_t __user *, offset, size_t, count)
@@ -1415,13 +1415,13 @@ SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, loff_t __user *, offset, si
if (offset) {
if (unlikely(copy_from_user(&pos, offset, sizeof(loff_t))))
return -EFAULT;
- ret = do_sendfile(out_fd, in_fd, &pos, count, 0);
+ ret = do_sendfile(out_fd, in_fd, &pos, count, 0, 0);
if (unlikely(put_user(pos, offset)))
return -EFAULT;
return ret;
}
- return do_sendfile(out_fd, in_fd, NULL, count, 0);
+ return do_sendfile(out_fd, in_fd, NULL, count, 0, 0);
}
#ifdef CONFIG_COMPAT
@@ -1436,13 +1436,13 @@ COMPAT_SYSCALL_DEFINE4(sendfile, int, out_fd, int, in_fd,
if (unlikely(get_user(off, offset)))
return -EFAULT;
pos = off;
- ret = do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS);
+ ret = do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS, 0);
if (unlikely(put_user(pos, offset)))
return -EFAULT;
return ret;
}
- return do_sendfile(out_fd, in_fd, NULL, count, 0);
+ return do_sendfile(out_fd, in_fd, NULL, count, 0, 0);
}
COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd,
@@ -1454,13 +1454,13 @@ COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd,
if (offset) {
if (unlikely(copy_from_user(&pos, offset, sizeof(loff_t))))
return -EFAULT;
- ret = do_sendfile(out_fd, in_fd, &pos, count, 0);
+ ret = do_sendfile(out_fd, in_fd, &pos, count, 0, 0);
if (unlikely(put_user(pos, offset)))
return -EFAULT;
return ret;
}
- return do_sendfile(out_fd, in_fd, NULL, count, 0);
+ return do_sendfile(out_fd, in_fd, NULL, count, 0, 0);
}
#endif
Extend the internal do_sendfile to take a flags argument, which will be used in future commits to signal that userland wants zerocopy notifications. This commit does not change anything about sendfile or sendfile64. Signed-off-by: Joe Damato <jdamato@fastly.com> --- fs/read_write.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)