Module Name: src
Committed By: tkusumi
Date: Sat Dec 21 11:59:03 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_ioctl.c dm_table.c dm_target.c
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 target's ->deps() by implementing deps in dm core
Retrieving device dependencies doesn't need to be target specific.
The reason it currently needs ->deps() is because dm core doesn't
have data structure that allows table to walk through target's
underlying devices. Add struct dm_mapping to be able to do this,
and remove ->deps()'s from targets which basically do the same thing.
=====(A) before this commit
table
| [dm core]
-------------------------------------------------------
| pdev pdev pdev [dm targets]
v ^ ^ ^
target----/---------/---------/
(void*)
=====(B) this commit
table---->mapping-->mapping-->mapping-->...
| | | |
| v v v [dm core]
-------------------------------------------------------
| pdev pdev pdev [dm targets]
v ^ ^ ^
target----/---------/---------/
(void*)
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/dm/dm_target.c \
src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.28 -r1.29 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.49 src/sys/dev/dm/dm.h:1.50
--- src/sys/dev/dm/dm.h:1.49 Fri Dec 20 16:16:36 2019
+++ src/sys/dev/dm/dm.h Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.49 2019/12/20 16:16:36 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.50 2019/12/21 11:59:03 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -65,6 +65,13 @@
extern const struct dkdriver dmdkdriver;
extern uint32_t dm_dev_counter;
+typedef struct dm_mapping {
+ union {
+ struct dm_pdev *pdev;
+ } data;
+ TAILQ_ENTRY(dm_mapping) next;
+} dm_mapping_t;
+
/*
* A device mapper table is a list of physical ranges plus the mapping target
* applied to them.
@@ -77,6 +84,8 @@ typedef struct dm_table_entry {
struct dm_target *target; /* Link to table target. */
void *target_config; /* Target specific data. */
SLIST_ENTRY(dm_table_entry) next;
+
+ TAILQ_HEAD(, dm_mapping) pdev_maps;
} dm_table_entry_t;
SLIST_HEAD(dm_table, dm_table_entry);
@@ -172,7 +181,6 @@ typedef struct dm_target {
/* Destroy target_config area */
int (*destroy)(dm_table_entry_t *);
- int (*deps)(dm_table_entry_t *, prop_array_t);
/*
* Info/table routine are called to get params string, which is target
* specific. When dm_table_status_ioctl is called with flag
@@ -237,7 +245,6 @@ int dm_target_linear_init(dm_table_entry
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_deps(dm_table_entry_t *, prop_array_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_secsize(dm_table_entry_t *, unsigned int *);
@@ -247,7 +254,6 @@ int dm_target_stripe_init(dm_table_entry
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_deps(dm_table_entry_t *, prop_array_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_secsize(dm_table_entry_t *, unsigned int *);
@@ -256,7 +262,6 @@ int dm_target_stripe_secsize(dm_table_en
int dm_target_error_init(dm_table_entry_t*, int, char **);
char *dm_target_error_table(void *);
int dm_target_error_strategy(dm_table_entry_t *, struct buf *);
-int dm_target_error_deps(dm_table_entry_t *, prop_array_t);
int dm_target_error_destroy(dm_table_entry_t *);
int dm_target_error_upcall(dm_table_entry_t *, struct buf *);
@@ -265,7 +270,6 @@ int dm_target_zero_init(dm_table_entry_t
char *dm_target_zero_table(void *);
int dm_target_zero_strategy(dm_table_entry_t *, struct buf *);
int dm_target_zero_destroy(dm_table_entry_t *);
-int dm_target_zero_deps(dm_table_entry_t *, prop_array_t);
int dm_target_zero_upcall(dm_table_entry_t *, struct buf *);
/* dm_table.c */
@@ -282,6 +286,7 @@ void dm_table_release(dm_table_head_t *,
void dm_table_switch_tables(dm_table_head_t *);
void dm_table_head_init(dm_table_head_t *);
void dm_table_head_destroy(dm_table_head_t *);
+int dm_table_add_deps(dm_table_entry_t *, dm_pdev_t *);
/* dm_dev.c */
dm_dev_t* dm_dev_alloc(void);
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.47 src/sys/dev/dm/dm_ioctl.c:1.48
--- src/sys/dev/dm/dm_ioctl.c:1.47 Thu Dec 19 16:27:39 2019
+++ src/sys/dev/dm/dm_ioctl.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.47 2019/12/19 16:27:39 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.48 2019/12/21 11:59:03 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_ioctl.c,v 1.47 2019/12/19 16:27:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.48 2019/12/21 11:59:03 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -116,6 +116,7 @@ static struct cfdata dm_cfdata = {
prop_dictionary_set_uint32(dm_dict,DM_IOCTL_FLAGS,flag); \
} while (/*CONSTCOND*/0)
+static int dm_table_deps(dm_table_entry_t *, prop_array_t);
static int dm_table_init(dm_target_t *, dm_table_entry_t *, char *);
/*
@@ -644,7 +645,7 @@ dm_table_deps_ioctl(prop_dictionary_t dm
tbl = dm_table_get_entry(&dmv->table_head, table_type);
SLIST_FOREACH(table_en, tbl, next)
- table_en->target->deps(table_en, cmd_array);
+ dm_table_deps(table_en, cmd_array);
dm_table_release(&dmv->table_head, table_type);
dm_dev_unbusy(dmv);
@@ -655,6 +656,36 @@ dm_table_deps_ioctl(prop_dictionary_t dm
return 0;
}
+static int
+dm_table_deps(dm_table_entry_t *table_en, prop_array_t array)
+{
+ dm_mapping_t *map;
+ int i, size;
+ uint64_t rdev, tmp;
+
+ size = prop_array_count(array);
+
+ TAILQ_FOREACH(map, &table_en->pdev_maps, next) {
+ rdev = map->data.pdev->pdev_vnode->v_rdev;
+ for (i = 0; i < size; i++) {
+ if (prop_array_get_uint64(array, i, &tmp) == true)
+ if (rdev == tmp)
+ break; /* exists */
+ }
+ /*
+ * Ignore if the device has already been added by
+ * other tables.
+ */
+ if (i == size) {
+ prop_array_add_uint64(array, rdev);
+ aprint_debug("%s: %d:%d\n", __func__, major(rdev),
+ minor(rdev));
+ }
+ }
+
+ return 0;
+}
+
/*
* Load new table/tables to device.
* Call apropriate target init routine open all physical pdev's and
@@ -746,6 +777,7 @@ dm_table_load_ioctl(prop_dictionary_t dm
table_en->target = target;
table_en->dm_dev = dmv;
table_en->target_config = NULL;
+ TAILQ_INIT(&table_en->pdev_maps);
/*
* There is a parameter string after dm_target_spec
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.16 src/sys/dev/dm/dm_table.c:1.17
--- src/sys/dev/dm/dm_table.c:1.16 Sun Dec 15 14:39:42 2019
+++ src/sys/dev/dm/dm_table.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.16 2019/12/15 14:39:42 tkusumi Exp $ */
+/* $NetBSD: dm_table.c,v 1.17 2019/12/21 11:59:03 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_table.c,v 1.16 2019/12/15 14:39:42 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.17 2019/12/21 11:59:03 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -54,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: dm_table.c,v
static int dm_table_busy(dm_table_head_t *, uint8_t);
static void dm_table_unbusy(dm_table_head_t *);
+static void dm_table_free_deps(dm_table_entry_t *);
+
/*
* Function to increment table user reference counter. Return id
@@ -166,6 +168,7 @@ dm_table_destroy(dm_table_head_t *head,
SLIST_REMOVE(tbl, table_en, dm_table_entry, next);
if (table_en->target->destroy(table_en) == 0)
table_en->target_config = NULL;
+ dm_table_free_deps(table_en);
kmem_free(table_en, sizeof(*table_en));
}
KASSERT(SLIST_EMPTY(tbl));
@@ -327,3 +330,47 @@ dm_table_head_destroy(dm_table_head_t *h
cv_destroy(&head->table_cv);
mutex_destroy(&head->table_mtx);
}
+
+int
+dm_table_add_deps(dm_table_entry_t *table_en, dm_pdev_t *pdev)
+{
+ dm_table_head_t *head;
+ dm_mapping_t *map;
+
+ if (!pdev)
+ return -1;
+
+ head = &table_en->dm_dev->table_head;
+ mutex_enter(&head->table_mtx);
+
+ TAILQ_FOREACH(map, &table_en->pdev_maps, next) {
+ if (map->data.pdev->pdev_vnode->v_rdev ==
+ pdev->pdev_vnode->v_rdev) {
+ mutex_exit(&head->table_mtx);
+ return -1;
+ }
+ }
+
+ map = kmem_alloc(sizeof(*map), KM_SLEEP);
+ map->data.pdev = pdev;
+ aprint_debug("%s: %s\n", __func__, pdev->name);
+ TAILQ_INSERT_TAIL(&table_en->pdev_maps, map, next);
+
+ mutex_exit(&head->table_mtx);
+
+ return 0;
+}
+
+/* caller must hold ->table_mtx */
+static void
+dm_table_free_deps(dm_table_entry_t *table_en)
+{
+ dm_mapping_t *map;
+
+ while ((map = TAILQ_FIRST(&table_en->pdev_maps)) != NULL) {
+ TAILQ_REMOVE(&table_en->pdev_maps, map, next);
+ aprint_debug("%s: %s\n", __func__, map->data.pdev->name);
+ kmem_free(map, sizeof(*map));
+ }
+ KASSERT(TAILQ_EMPTY(&table_en->pdev_maps));
+}
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.34 src/sys/dev/dm/dm_target.c:1.35
--- src/sys/dev/dm/dm_target.c:1.34 Thu Dec 19 15:34:54 2019
+++ src/sys/dev/dm/dm_target.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.34 2019/12/19 15:34:54 tkusumi Exp $ */
+/* $NetBSD: dm_target.c,v 1.35 2019/12/21 11:59:03 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.34 2019/12/19 15:34:54 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.35 2019/12/21 11:59:03 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -168,10 +168,6 @@ dm_target_insert(dm_target_t *dm_target)
printf("%s missing strategy\n", dm_target->name);
return EINVAL;
}
- if (dm_target->deps == NULL) {
- printf("%s missing deps\n", dm_target->name);
- return EINVAL;
- }
if (dm_target->destroy == NULL) {
printf("%s missing destroy\n", dm_target->name);
return EINVAL;
@@ -324,7 +320,6 @@ dm_target_init(void)
dmt->table = &dm_target_linear_table;
dmt->strategy = &dm_target_linear_strategy;
dmt->sync = &dm_target_linear_sync;
- dmt->deps = &dm_target_linear_deps;
dmt->destroy = &dm_target_linear_destroy;
dmt->upcall = &dm_target_linear_upcall;
dmt->secsize = &dm_target_linear_secsize;
@@ -339,7 +334,6 @@ dm_target_init(void)
dmt->table = &dm_target_stripe_table;
dmt->strategy = &dm_target_stripe_strategy;
dmt->sync = &dm_target_stripe_sync;
- dmt->deps = &dm_target_stripe_deps;
dmt->destroy = &dm_target_stripe_destroy;
dmt->upcall = &dm_target_stripe_upcall;
dmt->secsize = &dm_target_stripe_secsize;
@@ -353,7 +347,6 @@ dm_target_init(void)
dmt->init = &dm_target_error_init;
dmt->table = &dm_target_error_table;
dmt->strategy = &dm_target_error_strategy;
- dmt->deps = &dm_target_error_deps;
dmt->destroy = &dm_target_error_destroy;
dmt->upcall = &dm_target_error_upcall;
if (dm_target_insert(dmt))
@@ -366,7 +359,6 @@ dm_target_init(void)
dmt->init = &dm_target_zero_init;
dmt->table = &dm_target_zero_table;
dmt->strategy = &dm_target_zero_strategy;
- dmt->deps = &dm_target_zero_deps;
dmt->destroy = &dm_target_zero_destroy;
dmt->upcall = &dm_target_zero_upcall;
if (dm_target_insert(dmt))
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.34 src/sys/dev/dm/dm_target_linear.c:1.35
--- src/sys/dev/dm/dm_target_linear.c:1.34 Fri Dec 20 16:16:36 2019
+++ src/sys/dev/dm/dm_target_linear.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.34 2019/12/20 16:16:36 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.35 2019/12/21 11:59:03 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.34 2019/12/20 16:16:36 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.35 2019/12/21 11:59:03 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -75,6 +75,7 @@ dm_target_linear_init(dm_table_entry_t *
tlc->pdev = dmp;
tlc->offset = atoi64(argv[1]);
+ dm_table_add_deps(table_en, dmp);
table_en->target_config = tlc;
return 0;
@@ -162,23 +163,6 @@ out:
return 0;
}
-/* Add this target pdev dependencies to prop_array_t */
-int
-dm_target_linear_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
-{
- dm_target_linear_config_t *tlc;
-
- if (table_en->target_config == NULL)
- return ENOENT;
-
- tlc = table_en->target_config;
-
- prop_array_add_uint64(prop_array,
- (uint64_t) tlc->pdev->pdev_vnode->v_rdev);
-
- return 0;
-}
-
/*
* Register upcall device.
* Linear target doesn't need any upcall devices but other targets like
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.26 src/sys/dev/dm/dm_target_error.c:1.27
--- src/sys/dev/dm/dm_target_error.c:1.26 Wed Dec 18 14:31:35 2019
+++ src/sys/dev/dm/dm_target_error.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.26 2019/12/18 14:31:35 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.27 2019/12/21 11:59:03 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.26 2019/12/18 14:31:35 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.27 2019/12/21 11:59:03 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -73,7 +73,6 @@ dm_target_error_modcmd(modcmd_t cmd, voi
dmt->init = &dm_target_error_init;
dmt->table = &dm_target_error_table;
dmt->strategy = &dm_target_error_strategy;
- dmt->deps = &dm_target_error_deps;
dmt->destroy = &dm_target_error_destroy;
dmt->upcall = &dm_target_error_upcall;
@@ -145,14 +144,6 @@ dm_target_error_destroy(dm_table_entry_t
return 0;
}
-/* Doesn't not need to do anything here. */
-int
-dm_target_error_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
-{
-
- return 0;
-}
-
/* Unsupported for this target. */
int
dm_target_error_upcall(dm_table_entry_t *table_en, struct buf *bp)
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.22 src/sys/dev/dm/dm_target_mirror.c:1.23
--- src/sys/dev/dm/dm_target_mirror.c:1.22 Sun Dec 15 14:39:42 2019
+++ src/sys/dev/dm/dm_target_mirror.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.22 2019/12/15 14:39:42 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.23 2019/12/21 11:59:03 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.22 2019/12/15 14:39:42 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.23 2019/12/21 11:59:03 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -45,7 +45,6 @@ int dm_target_mirror_init(dm_table_entry
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_deps(dm_table_entry_t *, prop_array_t);
int dm_target_mirror_destroy(dm_table_entry_t *);
int dm_target_mirror_upcall(dm_table_entry_t *, struct buf *);
@@ -95,7 +94,6 @@ dm_target_mirror_modcmd(modcmd_t cmd, vo
dmt->table = &dm_target_mirror_table;
dmt->strategy = &dm_target_mirror_strategy;
dmt->sync = &dm_target_mirror_sync;
- dmt->deps = &dm_target_mirror_deps;
dmt->destroy = &dm_target_mirror_destroy;
dmt->upcall = &dm_target_mirror_upcall;
@@ -174,14 +172,6 @@ dm_target_mirror_destroy(dm_table_entry_
return 0;
}
-/* Doesn't not need to do anything here. */
-int
-dm_target_mirror_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
-{
-
- return 0;
-}
-
/* Unsupported for this target. */
int
dm_target_mirror_upcall(dm_table_entry_t *table_en, struct buf *bp)
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.36 src/sys/dev/dm/dm_target_snapshot.c:1.37
--- src/sys/dev/dm/dm_target_snapshot.c:1.36 Sun Dec 15 16:14:27 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.36 2019/12/15 16:14:27 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.37 2019/12/21 11:59:03 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.36 2019/12/15 16:14:27 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.37 2019/12/21 11:59:03 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -90,7 +90,6 @@ int dm_target_snapshot_init(dm_table_ent
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_deps(dm_table_entry_t *, prop_array_t);
int dm_target_snapshot_destroy(dm_table_entry_t *);
int dm_target_snapshot_upcall(dm_table_entry_t *, struct buf *);
@@ -99,7 +98,6 @@ int dm_target_snapshot_orig_init(dm_tabl
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_deps(dm_table_entry_t *, prop_array_t);
int dm_target_snapshot_orig_destroy(dm_table_entry_t *);
int dm_target_snapshot_orig_upcall(dm_table_entry_t *, struct buf *);
@@ -156,7 +154,6 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
dmt->table = &dm_target_snapshot_table;
dmt->strategy = &dm_target_snapshot_strategy;
dmt->sync = &dm_target_snapshot_sync;
- dmt->deps = &dm_target_snapshot_deps;
dmt->destroy = &dm_target_snapshot_destroy;
dmt->upcall = &dm_target_snapshot_upcall;
@@ -169,7 +166,6 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
dmt1->table = &dm_target_snapshot_orig_table;
dmt1->strategy = &dm_target_snapshot_orig_strategy;
dmt1->sync = &dm_target_snapshot_orig_sync;
- dmt1->deps = &dm_target_snapshot_orig_deps;
dmt1->destroy = &dm_target_snapshot_orig_destroy;
dmt1->upcall = &dm_target_snapshot_orig_upcall;
@@ -237,6 +233,8 @@ dm_target_snapshot_init(dm_table_entry_t
tsc->tsc_snap_dev = dmp_snap;
tsc->tsc_cow_dev = dmp_cow;
+ dm_table_add_deps(table_en, dmp_snap);
+ dm_table_add_deps(table_en, dmp_cow);
table_en->target_config = tsc;
return 0;
@@ -338,28 +336,6 @@ out:
return 0;
}
-/* Add this target dependencies to prop_array_t */
-int
-dm_target_snapshot_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
-{
- dm_target_snapshot_config_t *tsc;
-
- if (table_en->target_config == NULL)
- return 0;
-
- tsc = table_en->target_config;
-
- prop_array_add_uint64(prop_array,
- (uint64_t) tsc->tsc_snap_dev->pdev_vnode->v_rdev);
-
- if (tsc->tsc_persistent_dev) {
- prop_array_add_uint64(prop_array,
- (uint64_t) tsc->tsc_cow_dev->pdev_vnode->v_rdev);
-
- }
- return 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)
@@ -404,6 +380,7 @@ dm_target_snapshot_orig_init(dm_table_en
tsoc = kmem_alloc(sizeof(dm_target_snapshot_origin_config_t), KM_SLEEP);
tsoc->tsoc_real_dev = dmp_real;
+ dm_table_add_deps(table_en, dmp_real);
table_en->target_config = tsoc;
return 0;
@@ -498,35 +475,6 @@ out:
return 0;
}
-/*
- * Get target deps and add them to prop_array_t.
- */
-int
-dm_target_snapshot_orig_deps(dm_table_entry_t *table_en,
- prop_array_t prop_array)
-{
- dm_target_snapshot_origin_config_t *tsoc;
- struct vattr va;
-
- int error;
-
- if (table_en->target_config == NULL)
- return 0;
-
- tsoc = table_en->target_config;
-
- vn_lock(tsoc->tsoc_real_dev->pdev_vnode, LK_SHARED | LK_RETRY);
- error = VOP_GETATTR(tsoc->tsoc_real_dev->pdev_vnode, &va,
- curlwp->l_cred);
- VOP_UNLOCK(tsoc->tsoc_real_dev->pdev_vnode);
- if (error != 0)
- return error;
-
- prop_array_add_uint64(prop_array, (uint64_t) va.va_rdev);
-
- return 0;
-}
-
/* Unsupported for this target. */
int
dm_target_snapshot_orig_upcall(dm_table_entry_t *table_en, struct buf *bp)
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.41 src/sys/dev/dm/dm_target_stripe.c:1.42
--- src/sys/dev/dm/dm_target_stripe.c:1.41 Fri Dec 20 16:16:36 2019
+++ src/sys/dev/dm/dm_target_stripe.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.41 2019/12/20 16:16:36 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.42 2019/12/21 11:59:03 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.41 2019/12/20 16:16:36 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.42 2019/12/21 11:59:03 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -83,7 +83,6 @@ dm_target_stripe_modcmd(modcmd_t cmd, vo
dmt->table = &dm_target_stripe_table;
dmt->strategy = &dm_target_stripe_strategy;
dmt->sync = &dm_target_stripe_sync;
- dmt->deps = &dm_target_stripe_deps;
dmt->destroy = &dm_target_stripe_destroy;
dmt->upcall = &dm_target_stripe_upcall;
dmt->secsize = &dm_target_stripe_secsize;
@@ -169,6 +168,7 @@ dm_target_stripe_init(dm_table_entry_t *
return ENOENT;
}
tlc->offset = atoi64(argv[strpi+1]);
+ dm_table_add_deps(table_en, tlc->pdev);
/* Insert striping device to linked list. */
TAILQ_INSERT_TAIL(&tsc->stripe_devs, tlc, entries);
@@ -305,26 +305,6 @@ dm_target_stripe_destroy(dm_table_entry_
return 0;
}
-/* Doesn't not need to do anything here. */
-int
-dm_target_stripe_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
-{
- dm_target_stripe_config_t *tsc;
- dm_target_linear_config_t *tlc;
-
- if (table_en->target_config == NULL)
- return ENOENT;
-
- tsc = table_en->target_config;
-
- TAILQ_FOREACH(tlc, &tsc->stripe_devs, entries) {
- prop_array_add_uint64(prop_array,
- (uint64_t) tlc->pdev->pdev_vnode->v_rdev);
- }
-
- return 0;
-}
-
/* Unsupported for this target. */
int
dm_target_stripe_upcall(dm_table_entry_t *table_en, struct buf *bp)
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.28 src/sys/dev/dm/dm_target_zero.c:1.29
--- src/sys/dev/dm/dm_target_zero.c:1.28 Wed Dec 18 14:31:35 2019
+++ src/sys/dev/dm/dm_target_zero.c Sat Dec 21 11:59:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.28 2019/12/18 14:31:35 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.29 2019/12/21 11:59:03 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.28 2019/12/18 14:31:35 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.29 2019/12/21 11:59:03 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -73,7 +73,6 @@ dm_target_zero_modcmd(modcmd_t cmd, void
dmt->init = &dm_target_zero_init;
dmt->table = &dm_target_zero_table;
dmt->strategy = &dm_target_zero_strategy;
- dmt->deps = &dm_target_zero_deps;
dmt->destroy = &dm_target_zero_destroy;
dmt->upcall = &dm_target_zero_upcall;
@@ -150,14 +149,6 @@ dm_target_zero_destroy(dm_table_entry_t
return 0;
}
-/* Does not need to do anything here. */
-int
-dm_target_zero_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
-{
-
- return 0;
-}
-
/* Unsuported for this target. */
int
dm_target_zero_upcall(dm_table_entry_t *table_en, struct buf *bp)
