From owner-svn-src-all@FreeBSD.ORG Mon Jun 15 11:54:16 2015 Return-Path: Delivered-To: svn-src-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9269C29C; Mon, 15 Jun 2015 11:54:16 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id DF3ABA4D; Mon, 15 Jun 2015 11:54:14 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id OAA15602; Mon, 15 Jun 2015 14:54:12 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Z4Sxv-0008ko-V4; Mon, 15 Jun 2015 14:54:11 +0300 Message-ID: <557EBCAB.3010505@FreeBSD.org> Date: Mon, 15 Jun 2015 14:53:15 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Baptiste Daroussin , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core References: <201506151048.t5FAmnF0039077@svn.freebsd.org> In-Reply-To: <201506151048.t5FAmnF0039077@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2015 11:54:16 -0000 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