D16943.id47441.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16943.id47441.diff
View Options

	Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
	===================================================================
	--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
	+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
	@@ -661,6 +661,12 @@
	* Number of bytes consumed by bonus buffers.
	*/
	kstat_named_t arcstat_bonus_size;
	+#if defined(__FreeBSD__) && defined(COMPAT_FREEBSD11)
	+ /*
	+ * Sum of the previous three counters, provided for compatibility.
	+ */
	+ kstat_named_t arcstat_other_size;
	+#endif
	/*
	* Total number of bytes consumed by ARC buffers residing in the
	* arc_anon state. This includes all buffers in the arc_anon
	@@ -875,6 +881,9 @@
	{ "dbuf_size", KSTAT_DATA_UINT64 },
	{ "dnode_size", KSTAT_DATA_UINT64 },
	{ "bonus_size", KSTAT_DATA_UINT64 },
	+#if defined(__FreeBSD__) && defined(COMPAT_FREEBSD11)
	+ { "other_size", KSTAT_DATA_UINT64 },
	+#endif
	{ "anon_size", KSTAT_DATA_UINT64 },
	{ "anon_evictable_data", KSTAT_DATA_UINT64 },
	{ "anon_evictable_metadata", KSTAT_DATA_UINT64 },
	@@ -6825,6 +6834,11 @@
	ARCSTAT(arcstat_bonus_size) = aggsum_value(&astat_bonus_size);
	ARCSTAT(arcstat_dnode_size) = aggsum_value(&astat_dnode_size);
	ARCSTAT(arcstat_dbuf_size) = aggsum_value(&astat_dbuf_size);
	+#if defined(__FreeBSD__) && defined(COMPAT_FREEBSD11)
	+ ARCSTAT(arcstat_other_size) = aggsum_value(&astat_bonus_size) +
	+ aggsum_value(&astat_dnode_size) +
	+ aggsum_value(&astat_dbuf_size);
	+#endif
	ARCSTAT(arcstat_l2_hdr_size) = aggsum_value(&astat_l2_hdr_size);
	}