Module Name: src
Committed By: tkusumi
Date: Thu Dec 5 16:59:43 UTC 2019
Modified Files:
src/sys/dev/dm: dm_table.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: Make dm core set config to NULL after destroy
Just let dm core do this instead of having a comment expecting each
target to do the right thing.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.14 -r1.15 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_table.c
diff -u src/sys/dev/dm/dm_table.c:1.9 src/sys/dev/dm/dm_table.c:1.10
--- src/sys/dev/dm/dm_table.c:1.9 Wed Dec 4 15:31:12 2019
+++ src/sys/dev/dm/dm_table.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.9 2019/12/04 15:31:12 tkusumi Exp $ */
+/* $NetBSD: dm_table.c,v 1.10 2019/12/05 16:59:43 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.9 2019/12/04 15:31:12 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.10 2019/12/05 16:59:43 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -162,11 +162,8 @@ dm_table_destroy(dm_table_head_t * head,
while (!SLIST_EMPTY(tbl)) { /* List Deletion. */
table_en = SLIST_FIRST(tbl);
- /*
- * Remove target specific config data. After successfull
- * call table_en->target_config must be set to NULL.
- */
- table_en->target->destroy(table_en);
+ if (table_en->target->destroy(table_en) == 0)
+ table_en->target_config = NULL;
SLIST_REMOVE_HEAD(tbl, next);
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.13 src/sys/dev/dm/dm_target_error.c:1.14
--- src/sys/dev/dm/dm_target_error.c:1.13 Sun Dec 1 06:53:31 2019
+++ src/sys/dev/dm/dm_target_error.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.13 2019/12/01 06:53:31 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.14 2019/12/05 16:59:43 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.13 2019/12/01 06:53:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.14 2019/12/05 16:59:43 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -155,8 +155,6 @@ dm_target_error_sync(dm_table_entry_t *
int
dm_target_error_destroy(dm_table_entry_t * table_en)
{
- table_en->target_config = NULL;
-
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.21 src/sys/dev/dm/dm_target_linear.c:1.22
--- src/sys/dev/dm/dm_target_linear.c:1.21 Tue Dec 3 15:47:38 2019
+++ src/sys/dev/dm/dm_target_linear.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.21 2019/12/03 15:47:38 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.22 2019/12/05 16:59:43 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.21 2019/12/03 15:47:38 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.22 2019/12/05 16:59:43 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -166,7 +166,6 @@ dm_target_linear_destroy(dm_table_entry_
goto out;
dm_target_linear_config_t *tlc = table_en->target_config;
- table_en->target_config = NULL;
/* Decrement pdev ref counter if 0 remove it */
dm_pdev_decr(tlc->pdev);
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.11 src/sys/dev/dm/dm_target_mirror.c:1.12
--- src/sys/dev/dm/dm_target_mirror.c:1.11 Sun Dec 1 06:53:31 2019
+++ src/sys/dev/dm/dm_target_mirror.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.11 2019/12/01 06:53:31 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.12 2019/12/05 16:59:43 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.11 2019/12/01 06:53:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.12 2019/12/05 16:59:43 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -159,8 +159,6 @@ dm_target_mirror_sync(dm_table_entry_t *
int
dm_target_mirror_destroy(dm_table_entry_t * table_en)
{
- table_en->target_config = NULL;
-
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.22 src/sys/dev/dm/dm_target_snapshot.c:1.23
--- src/sys/dev/dm/dm_target_snapshot.c:1.22 Tue Dec 3 15:47:38 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.22 2019/12/03 15:47:38 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.23 2019/12/05 16:59:43 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.22 2019/12/03 15:47:38 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.23 2019/12/05 16:59:43 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -325,7 +325,6 @@ dm_target_snapshot_destroy(dm_table_entr
printf("Snapshot target destroy function called\n");
dm_target_snapshot_config_t *tsc = table_en->target_config;
- table_en->target_config = NULL;
/* Decrement pdev ref counter if 0 remove it */
dm_pdev_decr(tsc->tsc_snap_dev);
@@ -493,7 +492,6 @@ dm_target_snapshot_orig_destroy(dm_table
goto out;
dm_target_snapshot_origin_config_t *tsoc = table_en->target_config;
- table_en->target_config = NULL;
/* Decrement pdev ref counter if 0 remove it */
dm_pdev_decr(tsoc->tsoc_real_dev);
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.26 src/sys/dev/dm/dm_target_stripe.c:1.27
--- src/sys/dev/dm/dm_target_stripe.c:1.26 Tue Dec 3 15:47:38 2019
+++ src/sys/dev/dm/dm_target_stripe.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.26 2019/12/03 15:47:38 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.27 2019/12/05 16:59:43 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.26 2019/12/03 15:47:38 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.27 2019/12/05 16:59:43 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -310,7 +310,6 @@ int
dm_target_stripe_destroy(dm_table_entry_t * table_en)
{
dm_target_stripe_fini(table_en->target_config);
- table_en->target_config = NULL;
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.14 src/sys/dev/dm/dm_target_zero.c:1.15
--- src/sys/dev/dm/dm_target_zero.c:1.14 Sun Dec 1 06:53:31 2019
+++ src/sys/dev/dm/dm_target_zero.c Thu Dec 5 16:59:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.14 2019/12/01 06:53:31 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.15 2019/12/05 16:59:43 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.14 2019/12/01 06:53:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.15 2019/12/05 16:59:43 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -162,8 +162,6 @@ dm_target_zero_sync(dm_table_entry_t * t
int
dm_target_zero_destroy(dm_table_entry_t * table_en)
{
- table_en->target_config = NULL;
-
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
