Date: Thu, 20 Aug 2009 20:53:36 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r196406 - in stable/8: share/man/man9 sys sys/amd64/include/xen sys/cddl/contrib/opensolaris sys/contrib/dev/acpica sys/contrib/pf sys/dev/xen/xenpci sys/kern sys/sys Message-ID: <200908202053.n7KKraKs099106@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Thu Aug 20 20:53:36 2009 New Revision: 196406 URL: http://svn.freebsd.org/changeset/base/196406 Log: MFC 196404: 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: stable/8/share/man/man9/ (props changed) stable/8/share/man/man9/sglist.9 stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/kern/subr_sglist.c stable/8/sys/sys/sglist.h Modified: stable/8/share/man/man9/sglist.9 ============================================================================== --- stable/8/share/man/man9/sglist.9 Thu Aug 20 20:23:28 2009 (r196405) +++ stable/8/share/man/man9/sglist.9 Thu Aug 20 20:53:36 2009 (r196406) @@ -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: stable/8/sys/kern/subr_sglist.c ============================================================================== --- stable/8/sys/kern/subr_sglist.c Thu Aug 20 20:23:28 2009 (r196405) +++ stable/8/sys/kern/subr_sglist.c Thu Aug 20 20:53:36 2009 (r196406) @@ -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: stable/8/sys/sys/sglist.h ============================================================================== --- stable/8/sys/sys/sglist.h Thu Aug 20 20:23:28 2009 (r196405) +++ stable/8/sys/sys/sglist.h Thu Aug 20 20:53:36 2009 (r196406) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908202053.n7KKraKs099106>