diff options
| author | rwatson <rwatson@FreeBSD.org> | 2005-09-15 15:45:34 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2005-09-15 15:45:34 +0000 |
| commit | 7584b6b2c3e7877240ac00a66ab3749b1adfdca8 (patch) | |
| tree | ea5018339adf00fef1c9a768c6fba6017cb2656b | |
| parent | f7f404fd08fc10c304252f14f43b066e2da01876 (diff) | |
| download | FreeBSD-src-7584b6b2c3e7877240ac00a66ab3749b1adfdca8.zip FreeBSD-src-7584b6b2c3e7877240ac00a66ab3749b1adfdca8.tar.gz | |
The socket pointers in fifoinfo are not permitted to be NULL, so
don't check if they are, it just confuses the fifo code more.
MFC after: 3 days
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index f3a9c22..387edbc 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -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_cred = cred; - if (filetmp.f_data) - revents |= soo_poll(&filetmp, levents, cred, td); + revents |= soo_poll(&filetmp, levents, cred, td); /* Reverse the above conversion. */ 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) { filetmp.f_data = fip->fi_writesock; filetmp.f_cred = cred; - if (filetmp.f_data) { - revents |= soo_poll(&filetmp, levents, cred, td); - } + revents |= soo_poll(&filetmp, levents, cred, td); } return (revents); } |
