History

net: handle NULL ->poll gracefully

The big aio poll revert broke various network protocols that don't implement ->poll as a patch in the aio poll serie removed sock_no_poll and made the common code handle this case.

Christoph Hellwig committed 8 years ago

Commit e88958e1 parent 90368a31 file · +2 −0Browse files

Showing the changes to net (1 of 1 file). Show all

Unified · Split

net/socket.c+2−0
@@ -1133,6 +1133,8 @@ static __poll_t sock_poll(struct file *file, poll_table *wait) · 1132 unmodified lines
1133 __poll_t events = poll_requested_events(wait);1133 __poll_t events = poll_requested_events(wait);
1134 1134
1135 sock_poll_busy_loop(sock, events);1135 sock_poll_busy_loop(sock, events);
1136 if (!sock->ops->poll)
1137 return 0;
1136 return sock->ops->poll(file, sock, wait) | sock_poll_busy_flag(sock);1138 return sock->ops->poll(file, sock, wait) | sock_poll_busy_flag(sock);
1137}1139}
1138 1140

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t