PERFORCE change 83653 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=83653

Change 83653 by rwatson at rwatson_peppercorn on 2005/09/15 09:48:05

	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.

Affected files ...

.. //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#14 edit

Differences ...

==== //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#14 (text+ko) ====

@@ -674,8 +674,7 @@
 
 		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 @@
 	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);
 }