From owner-svn-src-head@freebsd.org  Mon Sep 11 12:08:21 2017
Return-Path: <owner-svn-src-head@freebsd.org>
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 7F0DDE08256;
 Mon, 11 Sep 2017 12:08:21 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C1DB82D76;
 Mon, 11 Sep 2017 12:08:21 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BC8K3X008545;
 Mon, 11 Sep 2017 12:08:20 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BC8KP9008544;
 Mon, 11 Sep 2017 12:08:20 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201709111208.v8BC8KP9008544@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 11 Sep 2017 12:08:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323434 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys
X-SVN-Group: head
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys
X-SVN-Commit-Revision: 323434
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Sep 2017 12:08:21 -0000

Author: avg
Date: Mon Sep 11 12:08:20 2017
New Revision: 323434
URL: https://svnweb.freebsd.org/changeset/base/323434

Log:
  Revert r322601, Mark ZFS ABD inline functions static
  
  An alternative fix is to be merged from illumos shortly.

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	Mon Sep 11 11:31:43 2017	(r323433)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h	Mon Sep 11 12:08:20 2017	(r323434)
@@ -61,7 +61,7 @@ typedef int abd_iter_func2_t(void *, void *, size_t, v
 
 extern boolean_t zfs_abd_scatter_enabled;
 
-static inline boolean_t
+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
  */
 
-static inline void
+inline void
 abd_copy(abd_t *dabd, abd_t *sabd, size_t size)
 {
 	abd_copy_off(dabd, sabd, 0, 0, size);
 }
 
-static inline void
+inline void
 abd_copy_from_buf(abd_t *abd, const void *buf, size_t size)
 {
 	abd_copy_from_buf_off(abd, buf, 0, size);
 }
 
-static inline void
+inline void
 abd_copy_to_buf(void* buf, abd_t *abd, size_t size)
 {
 	abd_copy_to_buf_off(buf, abd, 0, size);
 }
 
-static inline int
+inline int
 abd_cmp_buf(abd_t *abd, const void *buf, size_t size)
 {
 	return (abd_cmp_buf_off(abd, buf, 0, size));
 }
 
-static inline void
+inline void
 abd_zero(abd_t *abd, size_t size)
 {
 	abd_zero_off(abd, 0, size);