git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf record: Set frequency correctly
[pandora-kernel.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index
cc8e4de
..
1ad7031
100644
(file)
--- a/
fs/fcntl.c
+++ b/
fs/fcntl.c
@@
-117,11
+117,13
@@
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;
+ int retval = oldfd;
+
rcu_read_lock();
if (!fcheck_files(files, oldfd))
rcu_read_lock();
if (!fcheck_files(files, oldfd))
-
oldfd
= -EBADF;
+
retval
= -EBADF;
rcu_read_unlock();
rcu_read_unlock();
- return
oldfd
;
+ return
retval
;
}
return sys_dup3(oldfd, newfd, 0);
}
}
return sys_dup3(oldfd, newfd, 0);
}