epoll: ep_autoremove_wake_function should use list_del_init_careful

PATCH Superseded Benjamin Segall 1 participant 1 message Dec 6, 2022

Subsystems (2)

Stable branch VFS

lore

Share & tools

lore

Benjamin Segall

author

2022-12-06 22:00 UTC #0 lore raw

PATCH 1/1 epoll: ep_autoremove_wake_function should use list_del_init_careful

autoremove_wake_function uses list_del_init_careful, so should epoll's more aggressive variant. It only doesn't because it was copied from an older wait.c rather than the most recent.

Fixes a16ceb139610 ("epoll: autoremove wakers even more aggressively")

Signed-off-by Ben Segall <[email protected]>

Cc [email protected]

---
 fs/eventpoll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

fs/eventpoll.c +1 -1

index 52954d4637b5..081df056398a 100644
@@ -1756,11 +1756,11 @@ static struct timespec64 *ep_timeout_to_timespec(struct timespec64 *to, long ms)
 static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry,
 				       unsigned int mode, int sync, void *key)
 {
 	int ret = default_wake_function(wq_entry, mode, sync, key);
 
-	list_del_init(&wq_entry->entry);
+	list_del_init_careful(&wq_entry->entry);
 	return ret;
 }
 
 /**
  * ep_poll - Retrieves ready events, and delivers them to the caller-supplied

Signature · 1 line

2.39.0.rc0.267.gcb52ba06e7-goog