From owner-freebsd-current@FreeBSD.ORG Mon Feb 7 02:54:38 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 93591106566C for ; Mon, 7 Feb 2011 02:54:38 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 192BF8FC08 for ; Mon, 7 Feb 2011 02:54:37 +0000 (UTC) Received: by bwz12 with SMTP id 12so4444238bwz.13 for ; Sun, 06 Feb 2011 18:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=DnZc9Hgvj87jfypVKOMys52ZXSa3AZmGXyfGi5RH4IM=; b=fI8g8Xa5d7Gz1dclAXMwUiAoSFCbUQUuFOFyqC2Z90Zh9fD6hMgWCW4NtwYOXlaLsv Ij087Cj5c+5qG+gI91mvG9CXFJDJ9JLMDou85qLEe4GCZPcDOJjNqDIROM0X8lkq4aIH ceyP0CAvtGHpMb+emaifqnrzqa+4CpGVA+P0c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=h9JwI1tdVePN8beKZw2E2eftySG9mohjT6hFEGOyDU1r/XphoDA60pAvIu80r+0/LK 7nvCPKEU6hBu8Erb5JZllJVWKp23VyOyzDSHlN7tFYzcx61guguSrsub/9c+yI9rwTzk D3jgvDFkalfEGeCmXPwrZYsBdy33/HZeHvAXc= Received: by 10.204.101.133 with SMTP id c5mr9912194bko.124.1297047276864; Sun, 06 Feb 2011 18:54:36 -0800 (PST) Received: from localhost (tor-exit-router36-readme.formlessnetworking.net [199.48.147.36]) by mx.google.com with ESMTPS id a17sm1739421bku.11.2011.02.06.18.54.32 (version=SSLv3 cipher=RC4-MD5); Sun, 06 Feb 2011 18:54:35 -0800 (PST) From: Anonymous To: Rich References: <86k4hkiyr1.fsf@gmail.com> <86wrljuce6.fsf@gmail.com> Date: Mon, 07 Feb 2011 05:53:30 +0300 In-Reply-To: (Rich's message of "Sun, 6 Feb 2011 20:38:19 -0500") Message-ID: <86oc6ov9lh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain 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 02:54:38 -0000 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. %% @@ -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'. %% @@ -3563,8 +3573,7 @@ callback->awcb_private = private; callback->awcb_buf = buf; - write_policy(spa, wp, &zp); - zio = zio_write(pio, spa, txg, bp, buf->b_data, hdr->b_size, &zp, + zio = zio_write(pio, spa, txg, bp, buf->b_data, hdr->b_size, zp, arc_write_ready, arc_write_done, callback, priority, zio_flags, zb); return (zio); %% > This looks more broken than I might hope to fix trivially, since working > around the second one above results in more brokenness in dbuf.c. I suppose > I'll wait for an updated patchset to try this out again.