Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
52c47969
Commit
52c47969
authored
Aug 22, 2020
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do_epoll_ctl(): clean the failure exits up a bit
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
a9ed4a65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
13 deletions
+6
-13
fs/eventpoll.c
fs/eventpoll.c
+6
-13
No files found.
fs/eventpoll.c
View file @
52c47969
...
...
@@ -2203,29 +2203,22 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
full_check
=
1
;
if
(
is_file_epoll
(
tf
.
file
))
{
error
=
-
ELOOP
;
if
(
ep_loop_check
(
ep
,
tf
.
file
)
!=
0
)
{
clear_tfile_check_list
();
if
(
ep_loop_check
(
ep
,
tf
.
file
)
!=
0
)
goto
error_tgt_fput
;
}
}
else
{
get_file
(
tf
.
file
);
list_add
(
&
tf
.
file
->
f_tfile_llink
,
&
tfile_check_list
);
}
error
=
epoll_mutex_lock
(
&
ep
->
mtx
,
0
,
nonblock
);
if
(
error
)
{
out_del:
list_del
(
&
tf
.
file
->
f_tfile_llink
);
if
(
!
is_file_epoll
(
tf
.
file
))
fput
(
tf
.
file
);
if
(
error
)
goto
error_tgt_fput
;
}
if
(
is_file_epoll
(
tf
.
file
))
{
tep
=
tf
.
file
->
private_data
;
error
=
epoll_mutex_lock
(
&
tep
->
mtx
,
1
,
nonblock
);
if
(
error
)
{
mutex_unlock
(
&
ep
->
mtx
);
goto
out_del
;
goto
error_tgt_fput
;
}
}
}
...
...
@@ -2246,8 +2239,6 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
error
=
ep_insert
(
ep
,
epds
,
tf
.
file
,
fd
,
full_check
);
}
else
error
=
-
EEXIST
;
if
(
full_check
)
clear_tfile_check_list
();
break
;
case
EPOLL_CTL_DEL
:
if
(
epi
)
...
...
@@ -2270,8 +2261,10 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
mutex_unlock
(
&
ep
->
mtx
);
error_tgt_fput:
if
(
full_check
)
if
(
full_check
)
{
clear_tfile_check_list
();
mutex_unlock
(
&
epmutex
);
}
fdput
(
tf
);
error_fput:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment