Module Name: src
Committed By: tkusumi
Date: Tue Jan 21 16:27:53 UTC 2020
Modified Files:
src/sys/dev/dm: dm.h dm_target.c dm_target_delay.c dm_target_error.c
dm_target_flakey.c dm_target_linear.c dm_target_mirror.c
dm_target_snapshot.c dm_target_stripe.c dm_target_zero.c
Log Message:
dm: #if0 target's ->upcall() handler
This is part of NetBSD's dm design, but unimplemented
(all handlers return 0) and also unused.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/dm/dm_target.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/dm/dm_target_delay.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dm/dm_target_flakey.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.31 -r1.32 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.h
diff -u src/sys/dev/dm/dm.h:1.54 src/sys/dev/dm/dm.h:1.55
--- src/sys/dev/dm/dm.h:1.54 Sun Jan 5 08:08:26 2020
+++ src/sys/dev/dm/dm.h Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.54 2020/01/05 08:08:26 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.55 2020/01/21 16:27:53 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -182,7 +182,7 @@ typedef struct dm_target {
int (*destroy)(dm_table_entry_t *);
int (*strategy)(dm_table_entry_t *, struct buf *);
- int (*upcall)(dm_table_entry_t *, struct buf *);
+ //int (*upcall)(dm_table_entry_t *, struct buf *);
/*
* Optional routines.
@@ -247,7 +247,7 @@ char *dm_target_linear_table(void *);
int dm_target_linear_strategy(dm_table_entry_t *, struct buf *);
int dm_target_linear_sync(dm_table_entry_t *);
int dm_target_linear_destroy(dm_table_entry_t *);
-int dm_target_linear_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_linear_upcall(dm_table_entry_t *, struct buf *);
int dm_target_linear_secsize(dm_table_entry_t *, unsigned int *);
/* dm_target_stripe.c */
@@ -257,20 +257,20 @@ char *dm_target_stripe_table(void *);
int dm_target_stripe_strategy(dm_table_entry_t *, struct buf *);
int dm_target_stripe_sync(dm_table_entry_t *);
int dm_target_stripe_destroy(dm_table_entry_t *);
-int dm_target_stripe_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_stripe_upcall(dm_table_entry_t *, struct buf *);
int dm_target_stripe_secsize(dm_table_entry_t *, unsigned int *);
/* dm_target_error.c */
int dm_target_error_init(dm_table_entry_t*, int, char **);
int dm_target_error_strategy(dm_table_entry_t *, struct buf *);
int dm_target_error_destroy(dm_table_entry_t *);
-int dm_target_error_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_error_upcall(dm_table_entry_t *, struct buf *);
/* dm_target_zero.c */
int dm_target_zero_init(dm_table_entry_t *, int, char **);
int dm_target_zero_strategy(dm_table_entry_t *, struct buf *);
int dm_target_zero_destroy(dm_table_entry_t *);
-int dm_target_zero_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_zero_upcall(dm_table_entry_t *, struct buf *);
#if 0
/* dm_target_delay.c */
@@ -282,7 +282,7 @@ char *dm_target_delay_table(void *);
int dm_target_delay_strategy(dm_table_entry_t *, struct buf *);
int dm_target_delay_sync(dm_table_entry_t *);
int dm_target_delay_destroy(dm_table_entry_t *);
-int dm_target_delay_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_delay_upcall(dm_table_entry_t *, struct buf *);
int dm_target_delay_secsize(dm_table_entry_t *, unsigned int *);
/* dm_target_flakey.c */
@@ -291,7 +291,7 @@ char *dm_target_flakey_table(void *);
int dm_target_flakey_strategy(dm_table_entry_t *, struct buf *);
int dm_target_flakey_sync(dm_table_entry_t *);
int dm_target_flakey_destroy(dm_table_entry_t *);
-int dm_target_flakey_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_flakey_upcall(dm_table_entry_t *, struct buf *);
int dm_target_flakey_secsize(dm_table_entry_t *, unsigned int *);
#endif
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.39 src/sys/dev/dm/dm_target.c:1.40
--- src/sys/dev/dm/dm_target.c:1.39 Sun Jan 5 08:08:26 2020
+++ src/sys/dev/dm/dm_target.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.39 2020/01/05 08:08:26 tkusumi Exp $ */
+/* $NetBSD: dm_target.c,v 1.40 2020/01/21 16:27:53 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.c,v 1.39 2020/01/05 08:08:26 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.40 2020/01/21 16:27:53 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -168,10 +168,12 @@ dm_target_insert(dm_target_t *dm_target)
printf("%s missing destroy\n", dm_target->name);
return EINVAL;
}
+#if 0
if (dm_target->upcall == NULL) {
printf("%s missing upcall\n", dm_target->name);
return EINVAL;
}
+#endif
mutex_enter(&dm_target_mutex);
@@ -320,7 +322,7 @@ dm_target_init(void)
dmt->strategy = &dm_target_linear_strategy;
dmt->sync = &dm_target_linear_sync;
dmt->destroy = &dm_target_linear_destroy;
- dmt->upcall = &dm_target_linear_upcall;
+ //dmt->upcall = &dm_target_linear_upcall;
dmt->secsize = &dm_target_linear_secsize;
if (dm_target_insert(dmt))
printf("Failed to insert linear\n");
@@ -335,7 +337,7 @@ dm_target_init(void)
dmt->strategy = &dm_target_stripe_strategy;
dmt->sync = &dm_target_stripe_sync;
dmt->destroy = &dm_target_stripe_destroy;
- dmt->upcall = &dm_target_stripe_upcall;
+ //dmt->upcall = &dm_target_stripe_upcall;
dmt->secsize = &dm_target_stripe_secsize;
if (dm_target_insert(dmt))
printf("Failed to insert striped\n");
@@ -347,7 +349,7 @@ dm_target_init(void)
dmt->init = &dm_target_error_init;
dmt->strategy = &dm_target_error_strategy;
dmt->destroy = &dm_target_error_destroy;
- dmt->upcall = &dm_target_error_upcall;
+ //dmt->upcall = &dm_target_error_upcall;
if (dm_target_insert(dmt))
printf("Failed to insert error\n");
@@ -358,7 +360,7 @@ dm_target_init(void)
dmt->init = &dm_target_zero_init;
dmt->strategy = &dm_target_zero_strategy;
dmt->destroy = &dm_target_zero_destroy;
- dmt->upcall = &dm_target_zero_upcall;
+ //dmt->upcall = &dm_target_zero_upcall;
if (dm_target_insert(dmt))
printf("Failed to insert zero\n");
#if 0
@@ -372,7 +374,7 @@ dm_target_init(void)
dmt->strategy = &dm_target_delay_strategy;
dmt->sync = &dm_target_delay_sync;
dmt->destroy = &dm_target_delay_destroy;
- dmt->upcall = &dm_target_delay_upcall;
+ //dmt->upcall = &dm_target_delay_upcall;
dmt->secsize = &dm_target_delay_secsize;
if (dm_target_insert(dmt))
printf("Failed to insert delay\n");
@@ -387,7 +389,7 @@ dm_target_init(void)
dmt->strategy = &dm_target_flakey_strategy;
dmt->sync = &dm_target_flakey_sync;
dmt->destroy = &dm_target_flakey_destroy;
- dmt->upcall = &dm_target_flakey_upcall;
+ //dmt->upcall = &dm_target_flakey_upcall;
dmt->secsize = &dm_target_flakey_secsize;
if (dm_target_insert(dmt))
printf("Failed to insert flakey\n");
Index: src/sys/dev/dm/dm_target_delay.c
diff -u src/sys/dev/dm/dm_target_delay.c:1.1 src/sys/dev/dm/dm_target_delay.c:1.2
--- src/sys/dev/dm/dm_target_delay.c:1.1 Sun Jan 5 08:08:26 2020
+++ src/sys/dev/dm/dm_target_delay.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_delay.c,v 1.1 2020/01/05 08:08:26 tkusumi Exp $ */
+/* $NetBSD: dm_target_delay.c,v 1.2 2020/01/21 16:27:53 tkusumi Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_delay.c,v 1.1 2020/01/05 08:08:26 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_delay.c,v 1.2 2020/01/21 16:27:53 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -118,7 +118,7 @@ dm_target_delay_modcmd(modcmd_t cmd, voi
dmt->strategy = &dm_target_delay_strategy;
dmt->sync = &dm_target_delay_sync;
dmt->destroy = &dm_target_delay_destroy;
- dmt->upcall = &dm_target_delay_upcall;
+ //dmt->upcall = &dm_target_delay_upcall;
dmt->secsize = &dm_target_delay_secsize;
dm_target_delay_pool_create();
@@ -425,12 +425,14 @@ _destroy(struct dm_delay_info *di)
dm_pdev_decr(di->pdev);
}
+#if 0
int
dm_target_delay_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
+#endif
int
dm_target_delay_secsize(dm_table_entry_t *table_en, unsigned int *secsizep)
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.28 src/sys/dev/dm/dm_target_error.c:1.29
--- src/sys/dev/dm/dm_target_error.c:1.28 Mon Dec 23 16:17:35 2019
+++ src/sys/dev/dm/dm_target_error.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.28 2019/12/23 16:17:35 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.29 2020/01/21 16:27:53 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.28 2019/12/23 16:17:35 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.29 2020/01/21 16:27:53 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -73,7 +73,7 @@ dm_target_error_modcmd(modcmd_t cmd, voi
dmt->init = &dm_target_error_init;
dmt->strategy = &dm_target_error_strategy;
dmt->destroy = &dm_target_error_destroy;
- dmt->upcall = &dm_target_error_upcall;
+ //dmt->upcall = &dm_target_error_upcall;
r = dm_target_insert(dmt);
@@ -135,6 +135,7 @@ dm_target_error_destroy(dm_table_entry_t
return 0;
}
+#if 0
/* Unsupported for this target. */
int
dm_target_error_upcall(dm_table_entry_t *table_en, struct buf *bp)
@@ -142,3 +143,4 @@ dm_target_error_upcall(dm_table_entry_t
return 0;
}
+#endif
Index: src/sys/dev/dm/dm_target_flakey.c
diff -u src/sys/dev/dm/dm_target_flakey.c:1.2 src/sys/dev/dm/dm_target_flakey.c:1.3
--- src/sys/dev/dm/dm_target_flakey.c:1.2 Sun Jan 5 08:11:10 2020
+++ src/sys/dev/dm/dm_target_flakey.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_flakey.c,v 1.2 2020/01/05 08:11:10 tkusumi Exp $ */
+/* $NetBSD: dm_target_flakey.c,v 1.3 2020/01/21 16:27:53 tkusumi Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_flakey.c,v 1.2 2020/01/05 08:11:10 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_flakey.c,v 1.3 2020/01/21 16:27:53 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -107,7 +107,7 @@ dm_target_flakey_modcmd(modcmd_t cmd, vo
dmt->strategy = &dm_target_flakey_strategy;
dmt->sync = &dm_target_flakey_sync;
dmt->destroy = &dm_target_flakey_destroy;
- dmt->upcall = &dm_target_flakey_upcall;
+ //dmt->upcall = &dm_target_flakey_upcall;
dmt->secsize = &dm_target_flakey_secsize;
r = dm_target_insert(dmt);
@@ -494,12 +494,14 @@ out:
return 0;
}
+#if 0
int
dm_target_flakey_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
+#endif
int
dm_target_flakey_secsize(dm_table_entry_t *table_en, unsigned int *secsizep)
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.36 src/sys/dev/dm/dm_target_linear.c:1.37
--- src/sys/dev/dm/dm_target_linear.c:1.36 Sat Dec 28 15:38:16 2019
+++ src/sys/dev/dm/dm_target_linear.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.36 2019/12/28 15:38:16 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.37 2020/01/21 16:27:53 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.36 2019/12/28 15:38:16 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.37 2020/01/21 16:27:53 tkusumi Exp $");
/*
* This file implements initial version of device-mapper linear target.
@@ -163,6 +163,7 @@ out:
return 0;
}
+#if 0
/*
* Register upcall device.
* Linear target doesn't need any upcall devices but other targets like
@@ -174,6 +175,7 @@ dm_target_linear_upcall(dm_table_entry_t
return 0;
}
+#endif
/*
* Query physical block size of this target
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.23 src/sys/dev/dm/dm_target_mirror.c:1.24
--- src/sys/dev/dm/dm_target_mirror.c:1.23 Sat Dec 21 11:59:03 2019
+++ src/sys/dev/dm/dm_target_mirror.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.23 2019/12/21 11:59:03 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.24 2020/01/21 16:27:53 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.23 2019/12/21 11:59:03 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.24 2020/01/21 16:27:53 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -46,7 +46,7 @@ char *dm_target_mirror_table(void *);
int dm_target_mirror_strategy(dm_table_entry_t *, struct buf *);
int dm_target_mirror_sync(dm_table_entry_t *);
int dm_target_mirror_destroy(dm_table_entry_t *);
-int dm_target_mirror_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_mirror_upcall(dm_table_entry_t *, struct buf *);
typedef struct target_mirror_config {
#define MAX_MIRROR_COPIES 4
@@ -95,7 +95,7 @@ dm_target_mirror_modcmd(modcmd_t cmd, vo
dmt->strategy = &dm_target_mirror_strategy;
dmt->sync = &dm_target_mirror_sync;
dmt->destroy = &dm_target_mirror_destroy;
- dmt->upcall = &dm_target_mirror_upcall;
+ //dmt->upcall = &dm_target_mirror_upcall;
r = dm_target_insert(dmt);
@@ -172,6 +172,7 @@ dm_target_mirror_destroy(dm_table_entry_
return 0;
}
+#if 0
/* Unsupported for this target. */
int
dm_target_mirror_upcall(dm_table_entry_t *table_en, struct buf *bp)
@@ -179,3 +180,4 @@ dm_target_mirror_upcall(dm_table_entry_t
return 0;
}
+#endif
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.37 src/sys/dev/dm/dm_target_snapshot.c:1.38
--- src/sys/dev/dm/dm_target_snapshot.c:1.37 Sat Dec 21 11:59:03 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.37 2019/12/21 11:59:03 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.38 2020/01/21 16:27:53 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.37 2019/12/21 11:59:03 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.38 2020/01/21 16:27:53 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -91,7 +91,7 @@ char *dm_target_snapshot_table(void *);
int dm_target_snapshot_strategy(dm_table_entry_t *, struct buf *);
int dm_target_snapshot_sync(dm_table_entry_t *);
int dm_target_snapshot_destroy(dm_table_entry_t *);
-int dm_target_snapshot_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_snapshot_upcall(dm_table_entry_t *, struct buf *);
/* dm snapshot origin driver */
int dm_target_snapshot_orig_init(dm_table_entry_t *, int, char **);
@@ -99,7 +99,7 @@ char *dm_target_snapshot_orig_table(void
int dm_target_snapshot_orig_strategy(dm_table_entry_t *, struct buf *);
int dm_target_snapshot_orig_sync(dm_table_entry_t *);
int dm_target_snapshot_orig_destroy(dm_table_entry_t *);
-int dm_target_snapshot_orig_upcall(dm_table_entry_t *, struct buf *);
+//int dm_target_snapshot_orig_upcall(dm_table_entry_t *, struct buf *);
typedef struct target_snapshot_config {
dm_pdev_t *tsc_snap_dev;
@@ -155,7 +155,7 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
dmt->strategy = &dm_target_snapshot_strategy;
dmt->sync = &dm_target_snapshot_sync;
dmt->destroy = &dm_target_snapshot_destroy;
- dmt->upcall = &dm_target_snapshot_upcall;
+ //dmt->upcall = &dm_target_snapshot_upcall;
r = dm_target_insert(dmt);
@@ -167,7 +167,7 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
dmt1->strategy = &dm_target_snapshot_orig_strategy;
dmt1->sync = &dm_target_snapshot_orig_sync;
dmt1->destroy = &dm_target_snapshot_orig_destroy;
- dmt1->upcall = &dm_target_snapshot_orig_upcall;
+ //dmt1->upcall = &dm_target_snapshot_orig_upcall;
r = dm_target_insert(dmt1);
break;
@@ -336,6 +336,7 @@ out:
return 0;
}
+#if 0
/* Upcall is used to inform other depended devices about IO. */
int
dm_target_snapshot_upcall(dm_table_entry_t *table_en, struct buf *bp)
@@ -349,6 +350,7 @@ dm_target_snapshot_upcall(dm_table_entry
return 0;
}
+#endif
/*
* dm target snapshot origin routines.
@@ -475,6 +477,7 @@ out:
return 0;
}
+#if 0
/* Unsupported for this target. */
int
dm_target_snapshot_orig_upcall(dm_table_entry_t *table_en, struct buf *bp)
@@ -482,3 +485,4 @@ dm_target_snapshot_orig_upcall(dm_table_
return 0;
}
+#endif
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.43 src/sys/dev/dm/dm_target_stripe.c:1.44
--- src/sys/dev/dm/dm_target_stripe.c:1.43 Sat Dec 21 16:00:29 2019
+++ src/sys/dev/dm/dm_target_stripe.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.43 2019/12/21 16:00:29 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.44 2020/01/21 16:27:53 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.43 2019/12/21 16:00:29 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.44 2020/01/21 16:27:53 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -85,7 +85,7 @@ dm_target_stripe_modcmd(modcmd_t cmd, vo
dmt->strategy = &dm_target_stripe_strategy;
dmt->sync = &dm_target_stripe_sync;
dmt->destroy = &dm_target_stripe_destroy;
- dmt->upcall = &dm_target_stripe_upcall;
+ //dmt->upcall = &dm_target_stripe_upcall;
dmt->secsize = &dm_target_stripe_secsize;
r = dm_target_insert(dmt);
@@ -345,6 +345,7 @@ dm_target_stripe_destroy(dm_table_entry_
return 0;
}
+#if 0
/* Unsupported for this target. */
int
dm_target_stripe_upcall(dm_table_entry_t *table_en, struct buf *bp)
@@ -352,6 +353,7 @@ dm_target_stripe_upcall(dm_table_entry_t
return 0;
}
+#endif
/*
* Compute physical block size
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.31 src/sys/dev/dm/dm_target_zero.c:1.32
--- src/sys/dev/dm/dm_target_zero.c:1.31 Fri Dec 27 09:22:20 2019
+++ src/sys/dev/dm/dm_target_zero.c Tue Jan 21 16:27:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.31 2019/12/27 09:22:20 msaitoh Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.32 2020/01/21 16:27:53 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.31 2019/12/27 09:22:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.32 2020/01/21 16:27:53 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -73,7 +73,7 @@ dm_target_zero_modcmd(modcmd_t cmd, void
dmt->init = &dm_target_zero_init;
dmt->strategy = &dm_target_zero_strategy;
dmt->destroy = &dm_target_zero_destroy;
- dmt->upcall = &dm_target_zero_upcall;
+ //dmt->upcall = &dm_target_zero_upcall;
r = dm_target_insert(dmt);
break;
@@ -140,6 +140,7 @@ dm_target_zero_destroy(dm_table_entry_t
return 0;
}
+#if 0
/* Unsupported for this target. */
int
dm_target_zero_upcall(dm_table_entry_t *table_en, struct buf *bp)
@@ -147,3 +148,4 @@ dm_target_zero_upcall(dm_table_entry_t *
return 0;
}
+#endif
