d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The socket pointers in fifoinfo are not permitted to be NULL, so

Browse Source 
don't check if they are, it just confuses the fifo code more.

MFC after:	3 days
This commit is contained in:
Robert Watson 2005-09-15 15:45:34 +00:00
parent 68ff2a4397
commit ca17bccaa1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/fs/fifofs/fifo_vnops.c
View File

@ -674,8 +674,7 @@ fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td)
filetmp.f_data = fip->fi_readsock; filetmp.f_data = fip->fi_readsock;
filetmp.f_cred = cred; filetmp.f_cred = cred;
if (filetmp.f_data) revents |= soo_poll(&filetmp, levents, cred, td);
revents |= soo_poll(&filetmp, levents, cred, td);
/* Reverse the above conversion. */ /* Reverse the above conversion. */
if ((revents & POLLINIGNEOF) && !(events & POLLINIGNEOF)) { if ((revents & POLLINIGNEOF) && !(events & POLLINIGNEOF)) {
@ -687,9 +686,7 @@ fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td)
if ((fp->f_flag & FWRITE) && levents) { if ((fp->f_flag & FWRITE) && levents) {
filetmp.f_data = fip->fi_writesock; filetmp.f_data = fip->fi_writesock;
filetmp.f_cred = cred; filetmp.f_cred = cred;
if (filetmp.f_data) { revents |= soo_poll(&filetmp, levents, cred, td);
revents |= soo_poll(&filetmp, levents, cred, td);
}
} }
return (revents); return (revents);
} }