From owner-freebsd-stable@FreeBSD.ORG Tue May 19 20:49:17 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5631C106566C for ; Tue, 19 May 2009 20:49:17 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id E7D618FC0A for ; Tue, 19 May 2009 20:49:16 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.3/8.14.3) with ESMTP id n4JKnE5Y046286; Wed, 20 May 2009 00:49:14 +0400 (MSD) (envelope-from marck@rinet.ru) Date: Wed, 20 May 2009 00:49:14 +0400 (MSD) From: Dmitry Morozovsky To: Dimitry Andric In-Reply-To: <4A1317C9.90505@andric.com> Message-ID: References: <3c1674c90905151702l81c2b88off1d2b2ffed39ca2@mail.gmail.com> <4A11A666.3030407@andric.com> <4A12E929.4040406@andric.com> <4A1317C9.90505@andric.com> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (woozle.rinet.ru [0.0.0.0]); Wed, 20 May 2009 00:49:14 +0400 (MSD) Cc: freebsd-stable@freebsd.org Subject: Re: RFT: ZFS MFC X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2009 20:49:17 -0000 On Tue, 19 May 2009, Dimitry Andric wrote: DA> On 2009-05-19 22:10, Dmitry Morozovsky wrote: DA> > Just to be sure: is the patch based on sys/ hierarchy, and does not touch DA> > others (like sbin/)? DA> DA> No, it touches stuff in cddl/ too, so you need to build the world. Be DA> sure to use -E with patch, to cleanup emptied files. E.g.: DA> DA> patch -d /usr/src -p1 -f -F0 -E -i /path/to/zfs-mfc.patch Hmm, not too much success there: (in the process of building kernel) ===> zfs (all) cc -O2 -fno-strict-aliasing -pipe -march=athlon-mp -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -I/usr/src/sys/modules/zfs/../../cddl/compat/opensolaris -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/zmod -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common -I/usr/src/sys/modules/zfs/../.. -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/zfs -I/usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common -I/usr/src/sys/modules/zfs/../../../include -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/MOOSE/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -g -I/usr/obj/usr/src/sys/MOOSE -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -c /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.c In file included from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.h:33, from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.c:36: /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:35: error: conflicting types for 'aclent_t' /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/sys/acl.h:43: error: previous declaration of 'aclent_t' was here /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:40: error: redefinition of 'struct ace' /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:45: error: redefinition of typedef 'ace_t' /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/sys/acl.h:50: error: previous declaration of 'ace_t' was here In file included from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.h:33, from /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/common/acl/acl_common.c:36: /usr/src/sys/modules/zfs/../../cddl/compat/opensolaris/sys/acl.h:124:1: warning: "ACE_TYPE_FLAGS" redefined [much more after these...] Or, should I rebuild world previously? -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------