From 61088abb218aececfd978a3a8be8a2067cef0d32 Mon Sep 17 00:00:00 2001 From: Hou Tao Date: Sat, 28 Oct 2017 20:58:20 +0800 Subject: [PATCH 1/8] epoll: remove epmutex from ep_free() & eventpoll_release_file() Remove the global epmutex from ep_free() and eventpoll_release_file(). In the later patches, we will add locks with a smaller granularity to serve the same purposes of epmutex. Signed-off-by: Hou Tao Signed-off-by: Wei Li --- fs/eventpoll.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 113730881f11..520dee39dd38 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -826,7 +826,6 @@ static void ep_free(struct eventpoll *ep) * anymore. The only hit might come from eventpoll_release_file() but * holding "epmutex" is sufficient here. */ - mutex_lock(&epmutex); /* * Walks through the whole tree by unregistering poll callbacks. @@ -854,7 +853,6 @@ static void ep_free(struct eventpoll *ep) } mutex_unlock(&ep->mtx); - mutex_unlock(&epmutex); mutex_destroy(&ep->mtx); free_uid(ep->user); wakeup_source_unregister(ep->ws); @@ -1000,14 +998,12 @@ void eventpoll_release_file(struct file *file) * * Besides, ep_remove() acquires the lock, so we can't hold it here. */ - mutex_lock(&epmutex); list_for_each_entry_safe(epi, next, &file->f_ep_links, fllink) { ep = epi->ep; mutex_lock_nested(&ep->mtx, 0); ep_remove(ep, epi); mutex_unlock(&ep->mtx); } - mutex_unlock(&epmutex); } static int ep_alloc(struct eventpoll **pep) -- 2.17.1