Merge fifo_vnops.c:1.117 from HEAD to RELENG_6:
After going to some trouble to identify only the write-related events to poll the write socket for, the fifo polling code proceeded to poll for the complete set of events. Use 'levents' instead of 'events' as the argument to poll, and only poll the write socket if there is interest in write events. Approved by: re (kensmith)
This commit is contained in:
parent
5e1c31f370
commit
8c6b46594b
@ -641,11 +641,11 @@ fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td)
|
||||
}
|
||||
}
|
||||
levents = events & (POLLOUT | POLLWRNORM | POLLWRBAND);
|
||||
if (events) {
|
||||
if (levents) {
|
||||
filetmp.f_data = fip->fi_writesock;
|
||||
filetmp.f_cred = cred;
|
||||
if (filetmp.f_data) {
|
||||
revents |= soo_poll(&filetmp, events, cred, td);
|
||||
revents |= soo_poll(&filetmp, levents, cred, td);
|
||||
}
|
||||
}
|
||||
return (revents);
|
||||
|
Loading…
x
Reference in New Issue
Block a user