git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file: Replace fcheck_files with files_lookup_fd_rcu
[sfrench/cifs-2.6.git]
/
fs
/
file.c
diff --git
a/fs/file.c
b/fs/file.c
index 9d0e91168be185ecd2a05b3fcc581edd674e604f..5861c4f894195ce8fb3334fd15b38475dd688aef 100644
(file)
--- a/
fs/file.c
+++ b/
fs/file.c
@@
-814,7
+814,7
@@
static struct file *__fget_files(struct files_struct *files, unsigned int fd,
rcu_read_lock();
loop:
rcu_read_lock();
loop:
- file = f
check_files
(files, fd);
+ file = f
iles_lookup_fd_rcu
(files, fd);
if (file) {
/* File object ref couldn't be taken.
* dup2() atomicity guarantee is the reason
if (file) {
/* File object ref couldn't be taken.
* dup2() atomicity guarantee is the reason
@@
-1127,7
+1127,7
@@
SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int, newfd)
int retval = oldfd;
rcu_read_lock();
int retval = oldfd;
rcu_read_lock();
- if (!f
check_files
(files, oldfd))
+ if (!f
iles_lookup_fd_rcu
(files, oldfd))
retval = -EBADF;
rcu_read_unlock();
return retval;
retval = -EBADF;
rcu_read_unlock();
return retval;