diff mbox series

[RFC,26/27] epoll: massage the check list insertion

Message ID 20201004023929.2740074-26-viro@ZenIV.linux.org.uk (mailing list archive)
State New
Headers show
Series [RFC,01/27] epoll: switch epitem->pwqlist to single-linked list | expand

Commit Message

Al Viro Oct. 4, 2020, 2:39 a.m. UTC
From: Al Viro <viro@zeniv.linux.org.uk>

in the "non-epoll target" cases do it in ep_insert() rather than
in do_epoll_ctl(), so that we do it only with some epitem is already
guaranteed to exist.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/eventpoll.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 8a7ad752befd..eea269670168 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1375,6 +1375,10 @@  static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
 	spin_lock(&tfile->f_lock);
 	hlist_add_head_rcu(&epi->fllink, &tfile->f_ep_links);
 	spin_unlock(&tfile->f_lock);
+	if (full_check && !tep) {
+		get_file(tfile);
+		list_add(&tfile->f_tfile_llink, &tfile_check_list);
+	}
 
 	/*
 	 * Add the current item to the RB tree. All RB tree operations are
@@ -2013,10 +2017,6 @@  int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
 				error = -ELOOP;
 				if (ep_loop_check(ep, tep) != 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)