Date: Mon, 28 Jul 2008 00:55:49 -0400 From: "David Grochowski" <malus.x@gmail.com> To: freebsd-current@freebsd.org, freebsd-fs@freebsd.org Subject: Re: ZFS patches. Message-ID: <feb8ac710807272155m3ebf1f99na23bd62f065b8ecd@mail.gmail.com> In-Reply-To: <20080728032427.GN79560@egr.msu.edu> References: <20080727125413.GG1345@garage.freebsd.pl> <20080728032427.GN79560@egr.msu.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
Hey, On Sun, Jul 27, 2008 at 11:24 PM, Adam McDougall <mcdouga9@egr.msu.edu> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?feb8ac710807272155m3ebf1f99na23bd62f065b8ecd>