From owner-freebsd-current@FreeBSD.ORG Mon Jul 28 05:23:54 2008 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 7EFD6106564A for ; Mon, 28 Jul 2008 05:23:54 +0000 (UTC) (envelope-from malus.x@gmail.com) Received: from rv-out-0506.google.com (rv-out-0506.google.com [209.85.198.239]) by mx1.freebsd.org (Postfix) with ESMTP id 579F88FC1C for ; Mon, 28 Jul 2008 05:23:54 +0000 (UTC) (envelope-from malus.x@gmail.com) Received: by rv-out-0506.google.com with SMTP id b25so5112642rvf.43 for ; Sun, 27 Jul 2008 22:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=OTGlg+pZudvyCdFV06ezQVbeOcUFQaV9pKfjj8Va2DA=; b=Mwn6DbWWMoZ8/XJMFVKATPh+S/NkYM8nP2qnYH+mBXVGyBeLzgIbgbj7TfRn+yHeZa jXKZShwPDtkos4UsShZv7NPwr/Ru70GbcOAcWKF5yZGcn7OavjTsItsZMCZXO4LbWbu9 /sfxBbRbuadzIq9KzA1AFhgKBJGvPG/yRoqAk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=b2kEvr/GYqAtojimJO3mrBF3gspiey0DpB5yOgFIZrWzFOWGybV8c2+BeyKJ2McnO9 PYnRDqJZ9znursWFgjRIqZMAZqnRwgtTr2k5n4N/gtJUpgbBqhwBhsi8yViNWfPsbzW1 aC8B49wK8p7gl9n8+JDCeA8T+bvc69btVVuRI= Received: by 10.140.201.15 with SMTP id y15mr2129117rvf.145.1217220949197; Sun, 27 Jul 2008 21:55:49 -0700 (PDT) Received: by 10.140.162.15 with HTTP; Sun, 27 Jul 2008 21:55:49 -0700 (PDT) Message-ID: Date: Mon, 28 Jul 2008 00:55:49 -0400 From: "David Grochowski" To: freebsd-current@freebsd.org, freebsd-fs@freebsd.org In-Reply-To: <20080728032427.GN79560@egr.msu.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20080727125413.GG1345@garage.freebsd.pl> <20080728032427.GN79560@egr.msu.edu> Cc: Subject: Re: ZFS patches. 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, 28 Jul 2008 05:23:54 -0000 Hey, On Sun, Jul 27, 2008 at 11:24 PM, Adam McDougall wrote: > > On Sun, Jul 27, 2008 at 02:54:13PM +0200, Pawel Jakub Dawidek wrote: > > Hi. > > http://people.freebsd.org/~pjd/patches/zfs_20080727.patch.bz2 > > The patch applied fine for me, but I get a compile error part way through > a buildworld. My world/kernel is from -current from Thursday, I also > tried csupping HEAD first, cleaning up my source tree, doing things with > headers I shouldn't (which I will revert). To the best of my weak knowledge > of C, it seems like ace_t should be fine (I tried to trace it through the > includes). Am I doing something wrong? Also, is this patch expected to > apply to 7? (I can find out for myself if I don't hear). Thanks. > > cc -O2 -pipe -I/usr/src/cddl/lib/libzpool/../../../sys/cddl/compat/opensolaris > -I/usr/src/cddl/lib/libzpool/../../../cddl/compat/opensolaris/include > -I/usr/src/cddl/lib/libzpool/../../../cddl/compat/opensolaris/lib/libumem > -I/usr/src/cddl/lib/libzpool/../../../cddl/contrib/opensolaris/lib/libzpool/common > -I/usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -I/usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -I/usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/common/zfs > -I/usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common > -I/usr/src/cddl/lib/libzpool/../../../cddl/contrib/opensolaris/head > -I/usr/src/cddl/lib/libzpool/../../../cddl/lib/libumem > -I/usr/src/cddl/lib/libzpool/../../../cddl/contrib/opensolaris/lib/libnvpair -DWANTS_MUTEX_OWNED > -I/usr/src/cddl/lib/libzpool/../../../lib/libpthread/thread > -I/usr/src/cddl/lib/libzpool/../../../lib/libpthread/sys > -I/usr/src/cddl/lib/libzpool/../../../lib/libthr/arch/amd64/include -fstack-protector > -Wno-unknown-pragmas -c > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:35: > error: expected ')' before '*' token > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c: > In function 'zfs_oldacl_byteswap': > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:127: > error: 'ace_t' undeclared (first use in this function) > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:127: > error: (Each undeclared identifier is reported only once > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:127: > error: for each function it appears in.) > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:129: > error: expected expression before ')' token > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c: > In function 'zfs_znode_byteswap': > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:177: > error: 'ace_t' undeclared (first use in this function) > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c:177: > error: expected expression before ')' token > *** Error code 1 > > Stop in /usr/src/cddl/lib/libzpool. > *** Error code 1 > > Stop in /usr/src/cddl/lib. > *** Error code 1 > > Stop in /usr/src. > *** Error code 1 > > Stop in /usr/src. > *** Error code 1 > > Stop in /usr/src. > *** Error code 1 > > Stop in /usr/src. I had the same issue. Try deleting "/usr/src/sys/cddl/compat/opensolaris/sys/acl.h" and "/usr/src/sys/cddl/compat/opensolaris/sys/callb.h" (make sure that these files have a length of zero first!). When patching, these files are supposed to be deleted, but were instead left as empty files. Since these files are included before the actual ones in "/usr/src/sys/cddl/contrib/opensolaris/uts/common/sys", this will cause a problem. Also, I would like to note that the patch has been working for me without any problems. Sincerely, Dave Grochowski