upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix gcc-specific fallout from r320156, MFV of r318946, ZFS ABD

Browse source 
Reported by:	jhibbits
MFC after:	1 week
X-MFC with:	r320156
This commit is contained in:
Andriy Gapon 2017-06-23 08:42:53 +00:00
parent 94f66d603a
commit ee2d3c0a5b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
View file

@ -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

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
View file

@ -899,7 +899,7 @@ vdev_label_write_pad2(vdev_t *vd, const char *buf, size_t size)
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);