On 15/06/2015 13:48, Baptiste Daroussin wrote:
> Author: bapt
> Date: Mon Jun 15 10:48:48 2015
> New Revision: 284409
> URL: https://svnweb.freebsd.org/changeset/base/284409
>
> Log:
> Fix circular dependency between libzfs and libzfs_core
>
> libzfs_core is the wrapper around kernel ioctls, the ioctl compat code
> belongs
> to it
This is not 100% correct description.
libzfs_core provides a stable, committed interface, so it has a number of
functions that wrap ioctls, but libzfs calls many ioctls directly as well.
So that compat code is needed equally by both, but given that libzfs uses
libzfs_core your change moves things in the right direction.
P.S.
My personal preference would be to drop that compat code and to convince
ZFS/FreeBSD users to always use boot environments, so that their kernel and
userland never fall out of sync :)
> Modified:
> head/cddl/lib/libzfs/Makefile
> head/cddl/lib/libzfs_core/Makefile
>
> Modified: head/cddl/lib/libzfs/Makefile
> ==============================================================================
> --- head/cddl/lib/libzfs/Makefile Mon Jun 15 07:13:23 2015
> (r284408)
> +++ head/cddl/lib/libzfs/Makefile Mon Jun 15 10:48:48 2015
> (r284409)
> @@ -37,7 +37,6 @@ SRCS+= libzfs_changelist.c \
> zfs_comutil.c \
> zfs_deleg.c \
> zfs_fletcher.c \
> - zfs_ioctl_compat.c \
> zfs_namecheck.c \
> zfs_prop.c \
> zpool_prop.c \
>
> Modified: head/cddl/lib/libzfs_core/Makefile
> ==============================================================================
> --- head/cddl/lib/libzfs_core/Makefile Mon Jun 15 07:13:23 2015
> (r284408)
> +++ head/cddl/lib/libzfs_core/Makefile Mon Jun 15 10:48:48 2015
> (r284409)
> @@ -11,7 +11,8 @@ DPADD= ${LIBNVPAIR}
> LDADD= -lnvpair
>
> SRCS= libzfs_core.c \
> - libzfs_core_compat.c
> + libzfs_core_compat.c \
> + zfs_ioctl_compat.c
>
> SRCS+= libzfs_compat.c
>
>
--
Andriy Gapon
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
