From ca17bccaa171eada03f45ceb351cb398c8775f87 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Thu, 15 Sep 2005 15:45:34 +0000 Subject: [PATCH] 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 --- sys/fs/fifofs/fifo_vnops.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index f3a9c2289f4..387edbc0918 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); }