summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2017-03-23 08:00:16 +0000
committeravg <avg@FreeBSD.org>2017-03-23 08:00:16 +0000
commit4abf750946193d96bed1aaab29a125e85f0581ce (patch)
tree9614170a2bf42b0c4cc4fbcfca5d8b34e0193679 /sys/cddl
parentff9938d1382fa8461c8d32d158f6d8d000336ee2 (diff)
downloadFreeBSD-src-4abf750946193d96bed1aaab29a125e85f0581ce.zip
FreeBSD-src-4abf750946193d96bed1aaab29a125e85f0581ce.tar.gz
MFC r314913: MFV r314911: 7867 ARC space accounting leak
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
index d74ec7f..a194c68 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
@@ -2612,6 +2612,12 @@ arc_hdr_free_on_write(arc_buf_hdr_t *hdr)
size, hdr);
}
(void) refcount_remove_many(&state->arcs_size, size, hdr);
+ if (type == ARC_BUFC_METADATA) {
+ arc_space_return(size, ARC_SPACE_META);
+ } else {
+ ASSERT(type == ARC_BUFC_DATA);
+ arc_space_return(size, ARC_SPACE_DATA);
+ }
l2arc_free_data_on_write(hdr->b_l1hdr.b_pdata, size, type);
}
OpenPOWER on IntegriCloud