From owner-p4-projects@FreeBSD.ORG  Thu Sep 15 09:48:50 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 27D8716A421; Thu, 15 Sep 2005 09:48:50 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D4F1716A41F
	for <perforce@freebsd.org>; Thu, 15 Sep 2005 09:48:49 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE3743D45
	for <perforce@freebsd.org>; Thu, 15 Sep 2005 09:48:49 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8F9mnic054074
	for <perforce@freebsd.org>; Thu, 15 Sep 2005 09:48:49 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8F9mnqV054071
	for perforce@freebsd.org; Thu, 15 Sep 2005 09:48:49 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Sep 2005 09:48:49 GMT
Message-Id: <200509150948.j8F9mnqV054071@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83653 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Sep 2005 09:48:50 -0000

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

Change 83653 by rwatson@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);
 }