Unverified Commit 0feaf644 authored by Christian Brauner's avatar Christian Brauner
Browse files

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: default avatarChristian Brauner (Amutable) <brauner@kernel.org>
parent e9e5cd40

fs/eventpoll.c

+6 −6
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static void ep_free(struct eventpoll *ep) 
 * Called with &file->f_lock held,

 * returns with it released

 */

static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi,

static void ep_remove_file(struct eventpoll *ep, struct epitem *epi,

			     struct file *file)

{

	struct epitems_head *to_free = NULL;
@@ -854,7 +854,7 @@ static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi, 
	free_ephead(to_free);

}



static bool __ep_remove_epi(struct eventpoll *ep, struct epitem *epi)

static bool ep_remove_epi(struct eventpoll *ep, struct epitem *epi)

{

	lockdep_assert_held(&ep->mtx);
@@ -900,9 +900,9 @@ static void ep_remove_safe(struct eventpoll *ep, struct epitem *epi) 
		spin_unlock(&file->f_lock);

		return;

	}

	__ep_remove_file(ep, epi, file);

	ep_remove_file(ep, epi, file);



	if (__ep_remove_epi(ep, epi))

	if (ep_remove_epi(ep, epi))

		WARN_ON_ONCE(ep_refcount_dec_and_test(ep));

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



		spin_lock(&file->f_lock);

		__ep_remove_file(ep, epi, file);

		dispose = __ep_remove_epi(ep, epi);

		ep_remove_file(ep, epi, file);

		dispose = ep_remove_epi(ep, epi);



		mutex_unlock(&ep->mtx);