From owner-freebsd-current@FreeBSD.ORG Mon Feb 7 04:41:12 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3495A1065672 for ; Mon, 7 Feb 2011 04:41:12 +0000 (UTC) (envelope-from rincebrain@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id D80458FC14 for ; Mon, 7 Feb 2011 04:41:11 +0000 (UTC) Received: by qwj9 with SMTP id 9so3202714qwj.13 for ; Sun, 06 Feb 2011 20:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=CBIXUBfHZUR0xu+FErfpdX1a26H9j0IUx8Z0daKymJo=; b=WI15ygVBaRNYDSsMVKfbkroLnFV5kdaQYexKsQpmzvm6EQGJZssXcYDHVSsDez0xvH biZlozWOqrNzcjodmrLqf90wP4EsackgKg+Xgo5fr3SNZ2iDyV8ycdaMNQ1B8vONUKVr /JWDoD0wa0i3S0CjamQ4gI4eDRBoZORDM1TcU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=dBPr1YPh3PaKh1HxTF/1+fDyzSTBn3+nwYQ7GKDRUnC1JDgKNXDZSO2URAILCwh1P7 Lhx1rML1LdejuVYIDZsiAjAFOCFnrvDT7BRRq5OQ0jBOSm7mU7he1oq5w3PTU918HpU6 m4fwaNaOkiQLyuquzgX5qudSCHfbg7Ghrby5M= MIME-Version: 1.0 Received: by 10.229.97.134 with SMTP id l6mr5190361qcn.253.1297053670954; Sun, 06 Feb 2011 20:41:10 -0800 (PST) Received: by 10.229.230.5 with HTTP; Sun, 6 Feb 2011 20:41:10 -0800 (PST) In-Reply-To: <86oc6ov9lh.fsf@gmail.com> References: <86k4hkiyr1.fsf@gmail.com> <86wrljuce6.fsf@gmail.com> <86oc6ov9lh.fsf@gmail.com> Date: Sun, 6 Feb 2011 23:41:10 -0500 Message-ID: From: Rich To: Anonymous Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Olivier Smedts , FreeBSD-current , Shawn Webb Subject: Re: zpool v28 and -current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2011 04:41:12 -0000 On Sun, Feb 6, 2011 at 9:53 PM, Anonymous wrote: > Rich writes: > > >> Attempted this procedure today, make fails with: > [...] > >> > /usr/local/ncvs/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:188: > >> error: 'zfs_mdcomp_disable' undeclared here (not in a function) > > > > First error is just a variable undefined that was defined in the original > > file pre-patching in the function; redefined it as defined in the > original. > > No, it should be removed from there. See if you have arc.c.rej. > I do; as soon as I get to the machine in question, I'll quote it for you. > %% > @@ -186,14 +185,11 @@ > TUNABLE_QUAD("vfs.zfs.arc_max", &zfs_arc_max); > TUNABLE_QUAD("vfs.zfs.arc_min", &zfs_arc_min); > TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit); > -TUNABLE_INT("vfs.zfs.mdcomp_disable", &zfs_mdcomp_disable); > SYSCTL_DECL(_vfs_zfs); > SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0, > "Maximum ARC size"); > SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0, > "Minimum ARC size"); > -SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN, > - &zfs_mdcomp_disable, 0, "Disable metadata compression"); > > /* > * Note that buffers can be in one of 6 states: > %% > > >> > /usr/local/ncvs/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:3580: > >> warning: passing argument 7 of 'zio_write' discards qualifiers from > pointer target type > > > > Second error is because arc_write takes a const of that property now, and > > zio_write still doesn't, resulting in the warning as shown. Dunno what > the > > correct way to fix this is, as it's unclear to me why the change was > done. > > Did you count wrong? The 7th argument to zio_write() around 3580 line is > `&zp' vs. `zp'. > In my copy of said file, zp is defined in the signature of arc_write as const, which is where the error comes from. - Rich