D41823.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41823.diff
View Options

	diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
	--- a/sys/geom/geom_io.c
	+++ b/sys/geom/geom_io.c
	@@ -68,6 +68,9 @@
	#include <vm/vm_extern.h>
	#include <vm/vm_map.h>

	+#define KTR_GEOM_ENABLED \
	+ ((KTR_COMPILE & KTR_GEOM) != 0 && (ktr_mask & KTR_GEOM) != 0)
	+
	static int g_io_transient_map_bio(struct bio *bp);

	static struct g_bioq g_bio_run_down;
	@@ -142,7 +145,7 @@

	bp = uma_zalloc(biozone, M_NOWAIT \| M_ZERO);
	#ifdef KTR
	- if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) {
	+ if (KTR_GEOM_ENABLED) {
	struct stack st;

	CTR1(KTR_GEOM, "g_new_bio(): %p", bp);
	@@ -160,7 +163,7 @@

	bp = uma_zalloc(biozone, M_WAITOK \| M_ZERO);
	#ifdef KTR
	- if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) {
	+ if (KTR_GEOM_ENABLED) {
	struct stack st;

	CTR1(KTR_GEOM, "g_alloc_bio(): %p", bp);
	@@ -175,7 +178,7 @@
	g_destroy_bio(struct bio *bp)
	{
	#ifdef KTR
	- if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) {
	+ if (KTR_GEOM_ENABLED) {
	struct stack st;

	CTR1(KTR_GEOM, "g_destroy_bio(): %p", bp);
	@@ -220,7 +223,7 @@
	bp->bio_children++;
	}
	#ifdef KTR
	- if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) {
	+ if (KTR_GEOM_ENABLED) {
	struct stack st;

	CTR2(KTR_GEOM, "g_clone_bio(%p): %p", bp, bp2);
	@@ -249,7 +252,7 @@
	bp2->bio_attribute = bp->bio_attribute;
	bp->bio_children++;
	#ifdef KTR
	- if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) {
	+ if (KTR_GEOM_ENABLED) {
	struct stack st;

	CTR2(KTR_GEOM, "g_duplicate_bio(%p): %p", bp, bp2);