Rename struct file->f_ep_lock

This lock moves out of the CONFIG_EPOLL ifdef and becomes f_lock.  For now,
epoll remains the only user, but a future patch will use it to protect
f_flags as well.

Cc: Davide Libenzi <davidel@xmailserver.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

1 files changed, 7 insertions, 5 deletions

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 011b9b8c90c6..c5c424f23fd5 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -417,10 +417,10 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi)
         ep_unregister_pollwait(ep, epi);
 
         /* Remove the current item from the list of epoll hooks */
-        spin_lock(&file->f_ep_lock);
+        spin_lock(&file->f_lock);
         if (ep_is_linked(&epi->fllink))
                 list_del_init(&epi->fllink);
-        spin_unlock(&file->f_ep_lock);
+        spin_unlock(&file->f_lock);
 
         rb_erase(&epi->rbn, &ep->rbr);
 
@@ -538,7 +538,7 @@ void eventpoll_release_file(struct file *file)
         struct epitem *epi;
 
         /*
-         * We don't want to get "file->f_ep_lock" because it is not
+         * We don't want to get "file->f_lock" because it is not
          * necessary. It is not necessary because we're in the "struct file"
          * cleanup path, and this means that noone is using this file anymore.
          * So, for example, epoll_ctl() cannot hit here sicne if we reach this
@@ -547,6 +547,8 @@ void eventpoll_release_file(struct file *file)
          * will correctly serialize the operation. We do need to acquire
          * "ep->mtx" after "epmutex" because ep_remove() requires it when called
          * from anywhere but ep_free().
+         *
+         * Besides, ep_remove() acquires the lock, so we can't hold it here.
          */
         mutex_lock(&epmutex);
 
@@ -785,9 +787,9 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
                 goto error_unregister;
 
         /* Add the current item to the list of active epoll hook for this file */
-        spin_lock(&tfile->f_ep_lock);
+        spin_lock(&tfile->f_lock);
         list_add_tail(&epi->fllink, &tfile->f_ep_links);
-        spin_unlock(&tfile->f_ep_lock);
+        spin_unlock(&tfile->f_lock);
 
         /*
          * Add the current item to the RB tree. All RB tree operations are