From owner-p4-projects@FreeBSD.ORG  Tue Jun  9 11:17:01 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DFDCF1065677; Tue,  9 Jun 2009 11:16:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5694D106566B
	for <perforce@FreeBSD.org>; Tue,  9 Jun 2009 11:16:59 +0000 (UTC)
	(envelope-from zhaoshuai@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4015E8FC1A
	for <perforce@FreeBSD.org>; Tue,  9 Jun 2009 11:16:59 +0000 (UTC)
	(envelope-from zhaoshuai@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n59BGxg7069670
	for <perforce@FreeBSD.org>; Tue, 9 Jun 2009 11:16:59 GMT
	(envelope-from zhaoshuai@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n59BGx5o069668
	for perforce@freebsd.org; Tue, 9 Jun 2009 11:16:59 GMT
	(envelope-from zhaoshuai@FreeBSD.org)
Date: Tue, 9 Jun 2009 11:16:59 GMT
Message-Id: <200906091116.n59BGx5o069668@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhaoshuai@FreeBSD.org using -f
From: Zhao Shuai <zhaoshuai@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163886 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: Tue, 09 Jun 2009 11:17:03 -0000

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

Change 163886 by zhaoshuai@zhaoshuai on 2009/06/09 11:16:08

	fix a bug in fifo_read/write_f(), the 4th argument of generic_pipe_read/write
	is file flag.

Affected files ...

.. //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#12 edit
.. //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#12 edit

Differences ...

==== //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#12 (text+ko) ====

@@ -394,7 +394,8 @@
 
 	struct fifoinfo *fip = fp->f_data;
 
-	return (generic_pipe_read(fip->fi_rpipe, uio, cred, flags, td));
+	/* The 4th argument of generic_pipe_read is file flag */
+	return (generic_pipe_read(fip->fi_rpipe, uio, cred, fp->f_flag, td));
 }
 
 static int
@@ -403,7 +404,8 @@
 
 	struct fifoinfo *fip = fp->f_data;
 
-	return (generic_pipe_write(fip->fi_wpipe, uio, cred, flags, td));
+	/* The 4th argument of generic_pipe_write is file flag */
+	return (generic_pipe_write(fip->fi_wpipe, uio, cred, fp->f_flag, td));
 }
 
 static int

==== //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#12 (text+ko) ====

@@ -138,6 +138,7 @@
 
 	struct pipe *pipe = fp->f_data;
 
+	/* The 4th arguments of generic_pipe_read is file flag */
   	return generic_pipe_read(pipe, uio, active_cred, fp->f_flag, td);
 }
 
@@ -148,6 +149,7 @@
 
 	struct pipe *pipe = fp->f_data;
 
+	/* The 4th arguments of generic_pipe_write is file flag */
 	return generic_pipe_write(pipe, uio, active_cred, fp->f_flag, td);
 }