From owner-svn-src-all@FreeBSD.ORG Thu Aug 20 19:23:58 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2720106568F; Thu, 20 Aug 2009 19:23:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 912668FC64; Thu, 20 Aug 2009 19:23:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7KJNwkH096367; Thu, 20 Aug 2009 19:23:58 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7KJNwwc096363; Thu, 20 Aug 2009 19:23:58 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200908201923.n7KJNwwc096363@svn.freebsd.org> From: John Baldwin Date: Thu, 20 Aug 2009 19:23:58 +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: r196404 - in head: share/man/man9 sys/kern sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2009 19:23:58 -0000 Author: jhb Date: Thu Aug 20 19:23:58 2009 New Revision: 196404 URL: http://svn.freebsd.org/changeset/base/196404 Log: Change the 'resid' parameter to sglist_consume_uio() from an int to a size_t to match the recent type change of the uio_resid member of struct uio. Approved by: re (kib) Modified: head/share/man/man9/sglist.9 head/sys/kern/subr_sglist.c head/sys/sys/sglist.h Modified: head/share/man/man9/sglist.9 ============================================================================== --- head/share/man/man9/sglist.9 Thu Aug 20 19:17:53 2009 (r196403) +++ head/share/man/man9/sglist.9 Thu Aug 20 19:23:58 2009 (r196404) @@ -70,7 +70,7 @@ .Ft struct sglist * .Fn sglist_clone "struct sglist *sg" "int mflags" .Ft int -.Fn sglist_consume_uio "struct sglist *sg" "struct uio *uio" "int resid" +.Fn sglist_consume_uio "struct sglist *sg" "struct uio *uio" "size_t resid" .Ft int .Fn sglist_count "void *buf" "size_t len" .Ft void Modified: head/sys/kern/subr_sglist.c ============================================================================== --- head/sys/kern/subr_sglist.c Thu Aug 20 19:17:53 2009 (r196403) +++ head/sys/kern/subr_sglist.c Thu Aug 20 19:23:58 2009 (r196404) @@ -315,7 +315,7 @@ sglist_append_uio(struct sglist *sg, str * segments, then only the amount that fits is appended. */ int -sglist_consume_uio(struct sglist *sg, struct uio *uio, int resid) +sglist_consume_uio(struct sglist *sg, struct uio *uio, size_t resid) { struct iovec *iov; size_t done; Modified: head/sys/sys/sglist.h ============================================================================== --- head/sys/sys/sglist.h Thu Aug 20 19:17:53 2009 (r196403) +++ head/sys/sys/sglist.h Thu Aug 20 19:23:58 2009 (r196404) @@ -91,7 +91,7 @@ int sglist_append_user(struct sglist *sg struct thread *td); struct sglist *sglist_build(void *buf, size_t len, int mflags); struct sglist *sglist_clone(struct sglist *sg, int mflags); -int sglist_consume_uio(struct sglist *sg, struct uio *uio, int resid); +int sglist_consume_uio(struct sglist *sg, struct uio *uio, size_t resid); int sglist_count(void *buf, size_t len); void sglist_free(struct sglist *sg); int sglist_join(struct sglist *first, struct sglist *second);