Date: Wed, 20 May 2009 01:08:51 +0400 (MSD) From: Dmitry Morozovsky <marck@rinet.ru> To: Dimitry Andric <dimitry@andric.com> Cc: freebsd-stable@freebsd.org Subject: Re: RFT: ZFS MFC Message-ID: <alpine.BSF.2.00.0905200107250.44708@woozle.rinet.ru> In-Reply-To: <alpine.BSF.2.00.0905200048070.44708@woozle.rinet.ru> References: <3c1674c90905151702l81c2b88off1d2b2ffed39ca2@mail.gmail.com> <4A11A666.3030407@andric.com> <alpine.BSF.2.00.0905191532370.23397@woozle.rinet.ru> <4A12E929.4040406@andric.com> <alpine.BSF.2.00.0905200009060.44708@woozle.rinet.ru> <4A1317C9.90505@andric.com> <alpine.BSF.2.00.0905200048070.44708@woozle.rinet.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 20 May 2009, Dmitry Morozovsky wrote:
DM> DA> > Just to be sure: is the patch based on sys/ hierarchy, and does not touch
DM> DA> > others (like sbin/)?
DM> DA>
DM> DA> No, it touches stuff in cddl/ too, so you need to build the world. Be
DM> DA> sure to use -E with patch, to cleanup emptied files. E.g.:
DM> DA>
DM> DA> patch -d /usr/src -p1 -f -F0 -E -i /path/to/zfs-mfc.patch
After cleaning /usr/obj and buildworld in single thread I got
===> cddl/lib/libzfs (all)
cc -O2 -fno-strict-aliasing -pipe -march=athlon-mp -DZFS_NO_ACL
-I/usr/src/cddl/lib/libzfs/../../../sbin/mount
-I/usr/src/cddl/lib/libzfs/../../../cddl/lib/libumem
-I/usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris
-I/usr/src/cddl/lib/libzfs/../../../cddl/compat/opensolaris/include
-I/usr/src/cddl/lib/libzfs/../../../cddl/compat/opensolaris/lib/libumem
-I/usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzpool/common
-I/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/common/zfs
-I/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-I/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-I/usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/head
-I/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common
-I/usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libnvpair
-I/usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libuutil/common
-I/usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common
-DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wno-unknown-pragmas -c
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
In file included from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h:34,
from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c:29:
/usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:35:
error: conflicting types for 'aclent_t'
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys/acl.h:43:
error: previous declaration of 'aclent_t' was here
/usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:40:
error: redefinition of 'struct ace'
/usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:45:
error: redefinition of typedef 'ace_t'
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys/acl.h:50:
error: previous declaration of 'ace_t' was here
In file included from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h:34,
from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c:29:
/usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:124:1:
warning: "ACE_TYPE_FLAGS" redefined
In file included from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:31,
from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h:34,
from
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c:29:
/usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys/acl.h:178:1:
warning: this is the location of the previous definition
Any hints? Thanks!
--
Sincerely,
D.Marck [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer: marck@FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru ***
------------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.0905200107250.44708>