projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
select.c
diff --git
a/fs/select.c
b/fs/select.c
index dcbc1112b7ec214c063eaf5786bb17d5f208e6b0..fe0893afd931e02081eca0b968e30a19e7ce2a73 100644
(file)
--- a/
fs/select.c
+++ b/
fs/select.c
@@
-311,7
+311,7
@@
static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
{
fd_set_bits fds;
void *bits;
{
fd_set_bits fds;
void *bits;
- int ret, max_fds
et
;
+ int ret, max_fds;
unsigned int size;
struct fdtable *fdt;
/* Allocate small arguments on the stack to save memory and be faster */
unsigned int size;
struct fdtable *fdt;
/* Allocate small arguments on the stack to save memory and be faster */
@@
-321,13
+321,13
@@
static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
if (n < 0)
goto out_nofds;
if (n < 0)
goto out_nofds;
- /* max_fds
et
can increase, so grab it once to avoid race */
+ /* max_fds can increase, so grab it once to avoid race */
rcu_read_lock();
fdt = files_fdtable(current->files);
rcu_read_lock();
fdt = files_fdtable(current->files);
- max_fds
et = fdt->max_fdset
;
+ max_fds
= fdt->max_fds
;
rcu_read_unlock();
rcu_read_unlock();
- if (n > max_fds
et
)
- n = max_fds
et
;
+ if (n > max_fds)
+ n = max_fds;
/*
* We need 6 bitmaps (in/out/ex for both incoming and outgoing),
/*
* We need 6 bitmaps (in/out/ex for both incoming and outgoing),