From owner-svn-src-head@FreeBSD.ORG  Sun Mar  4 15:09:02 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5495F106566C;
	Sun,  4 Mar 2012 15:09:02 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4428A8FC0C;
	Sun,  4 Mar 2012 15:09:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q24F92G3039880;
	Sun, 4 Mar 2012 15:09:02 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q24F92WU039878;
	Sun, 4 Mar 2012 15:09:02 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201203041509.q24F92WU039878@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 4 Mar 2012 15:09:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232495 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Mar 2012 15:09:02 -0000

Author: kib
Date: Sun Mar  4 15:09:01 2012
New Revision: 232495
URL: http://svn.freebsd.org/changeset/base/232495

Log:
  pipe_read(): change the type of size to int, and remove signed clamp.
  pipe_write(): change the type of desiredsize back to int, its value fits.
  
  Requested by: bde
  MFC after:    3 weeks

Modified:
  head/sys/kern/sys_pipe.c

Modified: head/sys/kern/sys_pipe.c
==============================================================================
--- head/sys/kern/sys_pipe.c	Sun Mar  4 14:55:37 2012	(r232494)
+++ head/sys/kern/sys_pipe.c	Sun Mar  4 15:09:01 2012	(r232495)
@@ -647,7 +647,7 @@ pipe_read(fp, uio, active_cred, flags, t
 	struct pipe *rpipe;
 	int error;
 	int nread = 0;
-	u_int size;
+	int size;
 
 	rpipe = fp->f_data;
 	PIPE_LOCK(rpipe);
@@ -681,7 +681,7 @@ pipe_read(fp, uio, active_cred, flags, t
 			if (size > rpipe->pipe_buffer.cnt)
 				size = rpipe->pipe_buffer.cnt;
 			if (size > uio->uio_resid)
-				size = (u_int) uio->uio_resid;
+				size = uio->uio_resid;
 
 			PIPE_UNLOCK(rpipe);
 			error = uiomove(
@@ -1023,8 +1023,9 @@ pipe_write(fp, uio, active_cred, flags, 
 	struct thread *td;
 	int flags;
 {
-	int error;
-	size_t desiredsize, orig_resid;
+	int error = 0;
+	int desiredsize;
+	ssize_t orig_resid;
 	struct pipe *wpipe, *rpipe;
 
 	rpipe = fp->f_data;