diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-17 10:17:08 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-17 10:17:08 +0100 |
| commit | 18a6b6ca7231affbfedd7f004f58dfb6af22420e (patch) | |
| tree | 5fac111373d0124787cd4101ac585711628ba347 | |
| parent | a6c00abe2bb9c18b22fc96bd4040737ff7b4a94b (diff) | |
| download | linux-aarch64-18a6b6ca7231affbfedd7f004f58dfb6af22420e.tar.gz | |
Revert "Add generic compat_sys_sendfile implementation"
This reverts commit d85a06d5ef792f53b674dd7dfda92726dba5f761.
The compat_sys_sendfile prototype introduced by this patch does not
match the PowerPC implementation.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | fs/read_write.c | 22 | ||||
| -rw-r--r-- | include/linux/compat.h | 3 |
2 files changed, 0 insertions, 25 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 91b91c4a9ed..1adfb691e4f 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1007,25 +1007,3 @@ SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, loff_t __user *, offset, si return do_sendfile(out_fd, in_fd, NULL, count, 0); } - -#ifdef __ARCH_WANT_COMPAT_SYS_SENDFILE -asmlinkage int compat_sys_sendfile(int out_fd, int in_fd, - compat_off_t __user *offset, compat_size_t count) -{ - loff_t pos; - off_t off; - ssize_t ret; - - if (offset) { - if (unlikely(get_user(off, offset))) - return -EFAULT; - pos = off; - ret = do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS); - if (unlikely(put_user(pos, offset))) - return -EFAULT; - return ret; - } - - return do_sendfile(out_fd, in_fd, NULL, count, 0); -} -#endif /* __ARCH_WANT_COMPAT_SYS_SENDFILE */ diff --git a/include/linux/compat.h b/include/linux/compat.h index 5f2d2ccf8db..09b28b7369d 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -590,9 +590,6 @@ asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid, unsigned long liovcnt, const struct compat_iovec __user *rvec, unsigned long riovcnt, unsigned long flags); -asmlinkage int compat_sys_sendfile(int out_fd, int in_fd, - compat_off_t __user *offset, s32 count); - #else #define is_compat_task() (0) |