RFT: ZFS MFC

[Dmitry Morozovsky]

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 at FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------