Date: Fri, 29 Oct 2010 14:26:58 +0200 From: rainer@ultra-secure.de To: freebsd-fs@freebsd.org Subject: 8.1-RELEASE and cddl-sources from STABLE Message-ID: <ab57553ca5f4ad33ab091924d72be95b.squirrel@webmail.ultra-secure.de>
next in thread | raw e-mail | index | archive | help
Hi, is it possible to somehow get all the MFCs for ZFS-stuff that went into STABLE to compile in RELENG_8_1? I tried (as suggested by someone) to just copy over the cddl-src-tree, but that did not work: In file included from /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:50: /usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/misc.h:51: error: conflicting types for 'utsname' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:522: error: previous declaration of 'utsname' was here In file included from /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:51: /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h:467: error: expected declaration specifiers or '...' before 'zfs_userquota_prop_t' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:60: error: expected declaration specifiers or '...' before 'zfs_userquota_prop_t' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: In function 'zfs_valid_proplist': /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:829: error: 'zfs_userquota_prop_t' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:829: error: (Each undeclared identifier is reported only once /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:829: error: for each function it appears in.) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:829: error: expected ';' before 'uqtype' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:836: error: 'uqtype' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:836: warning: passing argument 4 of 'userquota_propname_decode' makes integer from pointer without a cast /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:836: warning: passing argument 5 of 'userquota_propname_decode' makes pointer from integer without a cast /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:836: error: too many arguments to function 'userquota_propname_decode' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:845: error: 'ZFS_PROP_USERQUOTA' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:846: error: 'ZFS_PROP_GROUPQUOTA' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:882: error: 'zfs_userquota_prop_prefixes' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: At top level: /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2103: error: expected declaration specifiers or '...' before 'zfs_userquota_prop_t' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: In function 'userquota_propname_decode': /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2105: error: 'zfs_userquota_prop_t' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2105: error: expected ';' before 'type' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2113: error: 'type' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2113: error: 'ZFS_NUM_USERQUOTA_PROPS' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2114: error: 'zfs_userquota_prop_prefixes' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2120: error: 'typep' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2122: error: 'ZFS_PROP_USERQUOTA' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2123: error: 'ZFS_PROP_USERUSED' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: At top level: /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2226: error: expected declaration specifiers or '...' before 'zfs_userquota_prop_t' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: In function 'zfs_prop_get_userquota_common': /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2235: error: 'typep' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2235: warning: passing argument 4 of 'userquota_propname_decode' makes integer from pointer without a cast /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2235: warning: passing argument 5 of 'userquota_propname_decode' makes pointer from integer without a cast /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2235: error: too many arguments to function 'userquota_propname_decode' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2240: error: 'ZFS_IOC_USERSPACE_ONE' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: In function 'zfs_prop_get_userquota_int': /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2252: error: 'zfs_userquota_prop_t' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2252: error: expected ';' before 'type' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2255: error: 'type' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2255: error: too many arguments to function 'zfs_prop_get_userquota_common' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: In function 'zfs_prop_get_userquota': /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2264: error: 'zfs_userquota_prop_t' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2264: error: expected ';' before 'type' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2267: error: 'type' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2267: error: too many arguments to function 'zfs_prop_get_userquota_common' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2275: error: 'ZFS_PROP_USERQUOTA' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:2275: error: 'ZFS_PROP_GROUPQUOTA' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: At top level: /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4141: error: expected declaration specifiers or '...' before 'zfs_userquota_prop_t' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c: In function 'zfs_userspace': /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4146: error: 'zfs_useracct_t' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4146: error: expected ';' before 'buf' /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4150: error: 'type' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4151: error: 'buf' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4155: error: 'zua' undeclared (first use in this function) /usr/src/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4158: error: 'ZFS_IOC_USERSPACE_MANY' undeclared (first use in this function) *** Error code 1 Does that actually make sense? Or should we just upgrade to STABLE and live with the problems? ;-) Best Regards, Rainer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ab57553ca5f4ad33ab091924d72be95b.squirrel>