Skip to content

Commit 0feaf64

Browse files
committed
eventpoll: drop vestigial __ prefix from ep_remove_{file,epi}()
With __ep_remove() gone, the double-underscore on __ep_remove_file() and __ep_remove_epi() no longer contrasts with a __-less parent and just reads as noise. Rename both to ep_remove_file() and ep_remove_epi(). No functional change. Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
1 parent e9e5cd4 commit 0feaf64

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

fs/eventpoll.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ static void ep_free(struct eventpoll *ep)
830830
* Called with &file->f_lock held,
831831
* returns with it released
832832
*/
833-
static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi,
833+
static void ep_remove_file(struct eventpoll *ep, struct epitem *epi,
834834
struct file *file)
835835
{
836836
struct epitems_head *to_free = NULL;
@@ -854,7 +854,7 @@ static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi,
854854
free_ephead(to_free);
855855
}
856856

857-
static bool __ep_remove_epi(struct eventpoll *ep, struct epitem *epi)
857+
static bool ep_remove_epi(struct eventpoll *ep, struct epitem *epi)
858858
{
859859
lockdep_assert_held(&ep->mtx);
860860

@@ -900,9 +900,9 @@ static void ep_remove_safe(struct eventpoll *ep, struct epitem *epi)
900900
spin_unlock(&file->f_lock);
901901
return;
902902
}
903-
__ep_remove_file(ep, epi, file);
903+
ep_remove_file(ep, epi, file);
904904

905-
if (__ep_remove_epi(ep, epi))
905+
if (ep_remove_epi(ep, epi))
906906
WARN_ON_ONCE(ep_refcount_dec_and_test(ep));
907907
}
908908

@@ -1147,8 +1147,8 @@ void eventpoll_release_file(struct file *file)
11471147
ep_unregister_pollwait(ep, epi);
11481148

11491149
spin_lock(&file->f_lock);
1150-
__ep_remove_file(ep, epi, file);
1151-
dispose = __ep_remove_epi(ep, epi);
1150+
ep_remove_file(ep, epi, file);
1151+
dispose = ep_remove_epi(ep, epi);
11521152

11531153
mutex_unlock(&ep->mtx);
11541154

0 commit comments

Comments
 (0)