svn commit: r322601 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys
Andriy Gapon
avg at FreeBSD.org
Thu Aug 17 07:43:47 UTC 2017
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
More information about the svn-src-all
mailing list