Module Name: src
Committed By: tkusumi
Date: Sat Dec 14 10:02:35 UTC 2019
Modified Files:
src/sys/dev/dm: dm_target_error.c dm_target_linear.c dm_target_mirror.c
dm_target_snapshot.c dm_target_stripe.c dm_target_zero.c
Log Message:
dm: Remove unconditional debug prints in targets' ->strategy()
Having debug prints in ->strategy() by default just to tell ->strategy()
is called is overkill.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_target_zero.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.19 src/sys/dev/dm/dm_target_error.c:1.20
--- src/sys/dev/dm/dm_target_error.c:1.19 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_error.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.19 2019/12/12 16:28:24 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.20 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.19 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.20 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -133,8 +133,6 @@ int
dm_target_error_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- printf("Error target read function called!!\n");
-
bp->b_error = EIO;
bp->b_resid = 0;
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.27 src/sys/dev/dm/dm_target_linear.c:1.28
--- src/sys/dev/dm/dm_target_linear.c:1.27 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_linear.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.27 2019/12/12 16:28:24 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.28 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.27 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.28 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -114,15 +114,11 @@ dm_target_linear_strategy(dm_table_entry
tlc = table_en->target_config;
-/* printf("Linear target read function called %" PRIu64 "!!\n",
- tlc->offset);*/
-
bp->b_blkno += tlc->offset;
VOP_STRATEGY(tlc->pdev->pdev_vnode, bp);
return 0;
-
}
/*
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.18 src/sys/dev/dm/dm_target_mirror.c:1.19
--- src/sys/dev/dm/dm_target_mirror.c:1.18 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_mirror.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.18 2019/12/12 16:28:24 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.19 2019/12/14 10:02:35 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.18 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.19 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -149,8 +149,6 @@ int
dm_target_mirror_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- printf("Mirror target read function called!!\n");
-
bp->b_error = EIO;
bp->b_resid = 0;
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.30 src/sys/dev/dm/dm_target_snapshot.c:1.31
--- src/sys/dev/dm/dm_target_snapshot.c:1.30 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.30 2019/12/12 16:28:24 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.31 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.30 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.31 2019/12/14 10:02:35 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -300,8 +300,6 @@ int
dm_target_snapshot_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- printf("Snapshot target read function called!!\n");
-
bp->b_error = EIO;
bp->b_resid = 0;
@@ -454,8 +452,6 @@ int
dm_target_snapshot_orig_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- printf("Snapshot_Orig target read function called!!\n");
-
bp->b_error = EIO;
bp->b_resid = 0;
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.34 src/sys/dev/dm/dm_target_stripe.c:1.35
--- src/sys/dev/dm/dm_target_stripe.c:1.34 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_stripe.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.34 2019/12/12 16:28:24 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.35 2019/12/14 10:02:35 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.34 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.35 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -226,9 +226,6 @@ dm_target_stripe_strategy(dm_table_entry
if (tsc == NULL)
return 0;
-/* printf("Stripe target read function called %" PRIu64 "!!\n",
- tlc->offset);*/
-
/* calculate extent of request */
KASSERT(bp->b_resid % DEV_BSIZE == 0);
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.21 src/sys/dev/dm/dm_target_zero.c:1.22
--- src/sys/dev/dm/dm_target_zero.c:1.21 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_zero.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.21 2019/12/12 16:28:24 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.22 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.21 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.22 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -139,8 +139,6 @@ int
dm_target_zero_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- /* printf("Zero target read function called %d!!\n", bp->b_bcount); */
-
memset(bp->b_data, 0, bp->b_bcount);
bp->b_resid = 0; /* nestiobuf_done wants b_resid = 0 to be sure
* that there is no other io to done */
