mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
sparc: switch compat {f,}truncate64() to COMPAT_SYSCALL_DEFINE
... and drop the pointless checks - sys_truncate() itself might've lacked the check when that stuff was first written, but it has already grown one by the time that stuff went into mainline. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
8c82ccd631
commit
3d0e354e4e
3 changed files with 12 additions and 18 deletions
|
@ -52,20 +52,14 @@
|
||||||
|
|
||||||
#include "systbls.h"
|
#include "systbls.h"
|
||||||
|
|
||||||
asmlinkage long sys32_truncate64(const char __user * path, unsigned long high, unsigned long low)
|
COMPAT_SYSCALL_DEFINE3(truncate64, const char __user *, path, u32, high, u32, low)
|
||||||
{
|
{
|
||||||
if ((int)high < 0)
|
return sys_truncate(path, ((u64)high << 32) | low);
|
||||||
return -EINVAL;
|
|
||||||
else
|
|
||||||
return sys_truncate(path, (high << 32) | low);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low)
|
COMPAT_SYSCALL_DEFINE3(ftruncate64, unsigned int, fd, u32, high, u32, low)
|
||||||
{
|
{
|
||||||
if ((int)high < 0)
|
return sys_ftruncate(fd, ((u64)high << 32) | low);
|
||||||
return -EINVAL;
|
|
||||||
else
|
|
||||||
return sys_ftruncate(fd, (high << 32) | low);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cp_compat_stat64(struct kstat *stat,
|
static int cp_compat_stat64(struct kstat *stat,
|
||||||
|
|
|
@ -49,12 +49,12 @@ asmlinkage long sys_utrap_install(utrap_entry_t type,
|
||||||
asmlinkage long sys_memory_ordering(unsigned long model);
|
asmlinkage long sys_memory_ordering(unsigned long model);
|
||||||
asmlinkage void sparc64_set_context(struct pt_regs *regs);
|
asmlinkage void sparc64_set_context(struct pt_regs *regs);
|
||||||
asmlinkage void sparc64_get_context(struct pt_regs *regs);
|
asmlinkage void sparc64_get_context(struct pt_regs *regs);
|
||||||
asmlinkage long sys32_truncate64(const char __user * path,
|
asmlinkage long compat_sys_truncate64(const char __user * path,
|
||||||
unsigned long high,
|
u32 high,
|
||||||
unsigned long low);
|
u32 low);
|
||||||
asmlinkage long sys32_ftruncate64(unsigned int fd,
|
asmlinkage long compat_sys_ftruncate64(unsigned int fd,
|
||||||
unsigned long high,
|
u32 high,
|
||||||
unsigned long low);
|
u32 low);
|
||||||
struct compat_stat64;
|
struct compat_stat64;
|
||||||
asmlinkage long compat_sys_stat64(const char __user * filename,
|
asmlinkage long compat_sys_stat64(const char __user * filename,
|
||||||
struct compat_stat64 __user *statbuf);
|
struct compat_stat64 __user *statbuf);
|
||||||
|
|
|
@ -34,8 +34,8 @@ sys_call_table32:
|
||||||
/*60*/ .word sys_umask, sys_chroot, compat_sys_newfstat, compat_sys_fstat64, sys_getpagesize
|
/*60*/ .word sys_umask, sys_chroot, compat_sys_newfstat, compat_sys_fstat64, sys_getpagesize
|
||||||
.word sys_msync, sys_vfork, compat_sys_pread64, compat_sys_pwrite64, sys_geteuid
|
.word sys_msync, sys_vfork, compat_sys_pread64, compat_sys_pwrite64, sys_geteuid
|
||||||
/*70*/ .word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect
|
/*70*/ .word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect
|
||||||
.word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys_getgroups16
|
.word sys_madvise, sys_vhangup, compat_sys_truncate64, sys_mincore, sys_getgroups16
|
||||||
/*80*/ .word sys_setgroups16, sys_getpgrp, sys_setgroups, compat_sys_setitimer, sys32_ftruncate64
|
/*80*/ .word sys_setgroups16, sys_getpgrp, sys_setgroups, compat_sys_setitimer, compat_sys_ftruncate64
|
||||||
.word sys_swapon, compat_sys_getitimer, sys_setuid, sys_sethostname, sys_setgid
|
.word sys_swapon, compat_sys_getitimer, sys_setuid, sys_sethostname, sys_setgid
|
||||||
/*90*/ .word sys_dup2, sys_setfsuid, compat_sys_fcntl, compat_sys_select, sys_setfsgid
|
/*90*/ .word sys_dup2, sys_setfsuid, compat_sys_fcntl, compat_sys_select, sys_setfsgid
|
||||||
.word sys_fsync, sys_setpriority, sys_socket, sys_connect, sys_accept
|
.word sys_fsync, sys_setpriority, sys_socket, sys_connect, sys_accept
|
||||||
|
|
Loading…
Reference in a new issue