Date: Mon, 11 Sep 2017 12:08:20 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> 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 Message-ID: <201709111208.v8BC8KP9008544@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709111208.v8BC8KP9008544>