From owner-svn-src-head@FreeBSD.ORG Sun Aug 25 06:30:58 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 290997FF; Sun, 25 Aug 2013 06:30:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mail0.glenbarber.us (mail0.glenbarber.us [IPv6:2607:fc50:1:2300:1001:1001:1001:face]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D75AD2B08; Sun, 25 Aug 2013 06:30:57 +0000 (UTC) Received: from glenbarber.us (unknown [IPv6:2001:470:8:1205:9918:e8ea:58d:40a5]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id 49B3C25D7; Sun, 25 Aug 2013 06:30:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 49B3C25D7 Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Sun, 25 Aug 2013 02:30:54 -0400 From: Glen Barber To: Andre Oppermann Subject: Re: svn commit: r254799 - in head/sys: dev/cas dev/hatm dev/iscsi_initiator dev/lge dev/mwl kern sys Message-ID: <20130825063054.GA65644@glenbarber.us> References: <201308241657.r7OGvie8033186@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FCuugMFkClbJLl1L" Content-Disposition: inline In-Reply-To: <201308241657.r7OGvie8033186@svn.freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Aug 2013 06:30:58 -0000 --FCuugMFkClbJLl1L Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Aug 24, 2013 at 04:57:44PM +0000, Andre Oppermann wrote: > Author: andre > Date: Sat Aug 24 16:57:44 2013 > New Revision: 254799 > URL: http://svnweb.freebsd.org/changeset/base/254799 >=20 > Log: > Add an mbuf pointer parameter to (*ext_free) to give the external > free function access to the mbuf the external memory was attached > to. > =20 > Mechanically adjust all users to include the mbuf parameter. > =20 > This fixes a long standing annoyance for external free functions. > Before one had to sacrifice one of the argument pointers for this. > =20 > Modified: head/sys/kern/uipc_mbuf.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/uipc_mbuf.c Sat Aug 24 16:55:53 2013 (r254798) > +++ head/sys/kern/uipc_mbuf.c Sat Aug 24 16:57:44 2013 (r254799) > @@ -247,8 +247,8 @@ m_freem(struct mbuf *mb) > */ > int > m_extadd(struct mbuf *mb, caddr_t buf, u_int size, > - void (*freef)(void *, void *), void *arg1, void *arg2, int flags, in= t type, > - int wait) > + void (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2, > + int flags, int type, int wait) > { > KASSERT(type !=3D EXT_CLUSTER, ("%s: EXT_CLUSTER not allowed", __func__= )); > =20 I think this breaks head/. cc -c -O2 -pipe -fno-strict-aliasing -std=3Dc99 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -DGPROF -DGPROF4 -DGUPROF -fno-builtin -mno-aes -mno-avx -mno-mmx -mno-sse -msoft-float -ffreestanding -fstack-protector -Werror -pg /src/sys/kern/uipc_cow.c /src/sys/kern/uipc_cow.c:164:2: error: incompatible pointer types passing 'void (void *, void *)' to parameter of type 'void (*)(struct mbuf *, void *, void *)' [-Werror,-Wincompatible-pointer-types] MEXTADD(m0, sf_buf_kva(sf), PAGE_SIZE, socow_iodone, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /src/sys/sys/mbuf.h:760:50: note: expanded from macro 'MEXTADD' (void )m_extadd((m), (caddr_t)(buf), (size), (free), (arg1), (arg2),\ ^~~~~~ /src/sys/sys/mbuf.h:898:14: note: passing argument to parameter here void (*)(struct mbuf *, void *, void *), void *, void *, ^ 1 error generated. *** Error code 1 Stop. bmake[1]: stopped in /obj/i386.i386/src/sys/LINT *** Error code 1 http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-i386-i386.full Glen --FCuugMFkClbJLl1L Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJSGaSeAAoJEFJPDDeguUaj1D4H/0uYt6ibBP30Clg1JmlkCTpF i1uOKg+kJU4p92BAp8GMbr6Vnv6Id0BBvJeV+ttvXTlNGmgp3i9m7sG5cOHFj8j/ gAiFAQ766L90MDg6cWS1XTecYRM7+EJUOQTD4xUJb6CyWGUoIExtTczPjeZKTR0y tHSFB3uYIOyBGKQtzIYLCjg/ofCpTYKvMb3+jZgpi23bSndLBTb/ppqynueTYRG9 5niUI+JDRJQXNX16q0YETYW7wYqbeQ9R+qZ6IVkVxtYZCOroET262sJodvLTWWzM kqLL1KP24jdvQJ/OacL0b0NqcVf96ZQl0BTTvpSj2LB4KLpVM65HK4NgtCNhGNQ= =C60/ -----END PGP SIGNATURE----- --FCuugMFkClbJLl1L--