projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index
cdc1419
..
bd215cc
100644
(file)
--- a/
fs/fcntl.c
+++ b/
fs/fcntl.c
@@
-50,7
+50,7
@@
static int get_close_on_exec(unsigned int fd)
return res;
}
return res;
}
-
asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int
flags)
+
SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int,
flags)
{
int err = -EBADF;
struct file * file, *tofree;
{
int err = -EBADF;
struct file * file, *tofree;
@@
-113,7
+113,7
@@
out_unlock:
return err;
}
return err;
}
-
asmlinkage long sys_dup2(unsigned int oldfd, unsigned int
newfd)
+
SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int,
newfd)
{
if (unlikely(newfd == oldfd)) { /* corner case */
struct files_struct *files = current->files;
{
if (unlikely(newfd == oldfd)) { /* corner case */
struct files_struct *files = current->files;
@@
-126,7
+126,7
@@
asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
return sys_dup3(oldfd, newfd, 0);
}
return sys_dup3(oldfd, newfd, 0);
}
-
asmlinkage long sys_dup(unsigned int
fildes)
+
SYSCALL_DEFINE1(dup, unsigned int,
fildes)
{
int ret = -EBADF;
struct file *file = fget(fildes);
{
int ret = -EBADF;
struct file *file = fget(fildes);
@@
-335,7
+335,7
@@
static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
return err;
}
return err;
}
-
asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long
arg)
+
SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd, unsigned long,
arg)
{
struct file *filp;
long err = -EBADF;
{
struct file *filp;
long err = -EBADF;
@@
-358,7
+358,8
@@
out:
}
#if BITS_PER_LONG == 32
}
#if BITS_PER_LONG == 32
-asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
+SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,
+ unsigned long, arg)
{
struct file * filp;
long err;
{
struct file * filp;
long err;