Skip to content

Commit 10b02a2

Browse files
oleg-nesterovbrauner
authored andcommitted
poll_wait: kill the obsolete wait_address check
This check is historical and no longer needed, wait_address is never NULL. These days we rely on the poll_table->_qproc check. NULL if select/poll is not going to sleep, or it already has a data to report, or all waiters have already been registered after the 1st iteration. However, poll_table *p can be NULL, see p9_fd_poll() for example, so we can't remove the "p != NULL" check. Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Oleg Nesterov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent cacd9ae commit 10b02a2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/poll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ typedef struct poll_table_struct {
4141

4242
static inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p)
4343
{
44-
if (p && p->_qproc && wait_address) {
44+
if (p && p->_qproc) {
4545
p->_qproc(filp, wait_address, p);
4646
/*
4747
* This memory barrier is paired in the wq_has_sleeper().

0 commit comments

Comments
 (0)