From owner-svn-src-head@freebsd.org Thu Aug 17 07:43:47 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82783DD3306; Thu, 17 Aug 2017 07:43:47 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citapm.icyb.net.ua (citapm.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 3B0C96651F; Thu, 17 Aug 2017 07:43:45 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citapm.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id KAA15220; Thu, 17 Aug 2017 10:43:44 +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 1diFSy-000IGD-32; Thu, 17 Aug 2017 10:43:44 +0300 Subject: Re: svn commit: r322601 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys To: John Baldwin , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201708162340.v7GNeWrL098164@repo.freebsd.org> From: Andriy Gapon Message-ID: <4786e0df-cbbd-d0fe-2e45-682b9fe24652@FreeBSD.org> Date: Thu, 17 Aug 2017 10:42:51 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <201708162340.v7GNeWrL098164@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2017 07:43:47 -0000 On 17/08/2017 02:40, John Baldwin wrote: > Author: jhb > Date: Wed Aug 16 23:40:32 2017 > New Revision: 322601 > URL: https://svnweb.freebsd.org/changeset/base/322601 > > Log: > Mark ZFS ABD inline functions static. > > When built with -fno-inline-functions zfs.ko contains undefined references > to these functions if they are only marked inline. > > Reviewed by: avg (earlier version) I think that you rushed a little bit on this one: https://github.com/openzfs/openzfs/pull/444 But no big deal, it will be easy to merge once the upstream wakes up :-) > MFC after: 1 week > Sponsored by: Chelsio Communications > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h Wed Aug 16 22:54:35 2017 (r322600) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h Wed Aug 16 23:40:32 2017 (r322601) > @@ -61,7 +61,7 @@ typedef int abd_iter_func2_t(void *, void *, size_t, v > > extern boolean_t zfs_abd_scatter_enabled; > > -inline boolean_t > +static inline boolean_t > abd_is_linear(abd_t *abd) > { > return ((abd->abd_flags & ABD_FLAG_LINEAR) != 0 ? B_TRUE : B_FALSE); > @@ -110,31 +110,31 @@ void abd_zero_off(abd_t *, size_t, size_t); > * Wrappers for calls with offsets of 0 > */ > > -inline void > +static inline void > abd_copy(abd_t *dabd, abd_t *sabd, size_t size) > { > abd_copy_off(dabd, sabd, 0, 0, size); > } > > -inline void > +static inline void > abd_copy_from_buf(abd_t *abd, const void *buf, size_t size) > { > abd_copy_from_buf_off(abd, buf, 0, size); > } > > -inline void > +static inline void > abd_copy_to_buf(void* buf, abd_t *abd, size_t size) > { > abd_copy_to_buf_off(buf, abd, 0, size); > } > > -inline int > +static inline int > abd_cmp_buf(abd_t *abd, const void *buf, size_t size) > { > return (abd_cmp_buf_off(abd, buf, 0, size)); > } > > -inline void > +static inline void > abd_zero(abd_t *abd, size_t size) > { > abd_zero_off(abd, 0, size); > -- Andriy Gapon