Author: avg
Date: Fri Jun 23 08:42:53 2017
New Revision: 320262
URL: https://svnweb.freebsd.org/changeset/base/320262
Log:
fix gcc-specific fallout from r320156, MFV of r318946, ZFS ABD
Reported by: jhibbits
MFC after: 1 week
X-MFC with: r320156
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Jun 23
08:35:54 2017 (r320261)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Jun 23
08:42:53 2017 (r320262)
@@ -4354,6 +4354,7 @@ arc_reclaim_needed(void)
extern kmem_cache_t *zio_buf_cache[];
extern kmem_cache_t *zio_data_buf_cache[];
extern kmem_cache_t *range_seg_cache;
+extern kmem_cache_t *abd_chunk_cache;
static __noinline void
arc_kmem_reap_now(void)
@@ -4361,7 +4362,6 @@ arc_kmem_reap_now(void)
size_t i;
kmem_cache_t *prev_cache = NULL;
kmem_cache_t *prev_data_cache = NULL;
- extern kmem_cache_t *abd_chunk_cache;
DTRACE_PROBE(arc__kmem_reap_start);
#ifdef _KERNEL
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c Fri Jun
23 08:35:54 2017 (r320261)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c Fri Jun
23 08:42:53 2017 (r320262)
@@ -899,7 +899,7 @@ vdev_label_write_pad2(vdev_t *vd, const char *buf, siz
pad2 = abd_alloc_for_io(VDEV_PAD_SIZE, B_TRUE);
abd_zero(pad2, VDEV_PAD_SIZE);
- abd_copy_from_buf(pad2, (void *)buf, size);
+ abd_copy_from_buf(pad2, __DECONST(void *, buf), size);
retry:
zio = zio_root(spa, NULL, NULL, flags);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
