Module Name: src
Committed By: tkusumi
Date: Sun Dec 15 09:42:29 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_table.c dm_target.c dm_target_error.c
dm_target_mirror.c dm_target_snapshot.c dm_target_zero.c
Log Message:
dm: Make targets' ->secsize() optional
and make a caller assume secsize 0 if ->secsize not present.
This allows a dummy function to be removed which was added in
"dm: Add dummy target ->sync()/->secsize() to prevent panic on modload(8)".
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/dm/dm_target.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.23 -r1.24 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.43 src/sys/dev/dm/dm.h:1.44
--- src/sys/dev/dm/dm.h:1.43 Sun Dec 15 09:22:28 2019
+++ src/sys/dev/dm/dm.h Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.43 2019/12/15 09:22:28 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.44 2019/12/15 09:42:29 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -193,6 +193,9 @@ typedef struct dm_target {
int (*strategy)(dm_table_entry_t *, struct buf *);
int (*sync)(dm_table_entry_t *);
int (*upcall)(dm_table_entry_t *, struct buf *);
+ /*
+ * Optional routines.
+ */
int (*secsize)(dm_table_entry_t *, unsigned int *);
uint32_t version[3];
@@ -298,13 +301,6 @@ int dm_pdev_destroy(void);
int dm_pdev_init(void);
dm_pdev_t* dm_pdev_insert(const char *);
-/* XXX dummy */
-static __inline int
-dm_target_dummy_secsize(dm_table_entry_t *table_en, unsigned int *secsizep)
-{
- return 0;
-}
-
#endif /*_KERNEL*/
#endif /*_DM_DEV_H_*/
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.14 src/sys/dev/dm/dm_table.c:1.15
--- src/sys/dev/dm/dm_table.c:1.14 Sun Dec 15 09:22:28 2019
+++ src/sys/dev/dm/dm_table.c Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.14 2019/12/15 09:22:28 tkusumi Exp $ */
+/* $NetBSD: dm_table.c,v 1.15 2019/12/15 09:42:29 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.14 2019/12/15 09:22:28 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.15 2019/12/15 09:42:29 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -248,7 +248,10 @@ dm_table_disksize(dm_table_head_t *head,
secsize = 0;
SLIST_FOREACH(table_en, tbl, next) {
length += table_en->length;
- table_en->target->secsize(table_en, &tsecsize);
+ if (table_en->target->secsize)
+ table_en->target->secsize(table_en, &tsecsize);
+ else
+ tsecsize = 0;
if (secsize < tsecsize)
secsize = tsecsize;
}
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.29 src/sys/dev/dm/dm_target.c:1.30
--- src/sys/dev/dm/dm_target.c:1.29 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target.c Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.29 2019/12/15 05:56:02 tkusumi Exp $ */
+/* $NetBSD: dm_target.c,v 1.30 2019/12/15 09:42:29 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.29 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.30 2019/12/15 09:42:29 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -184,10 +184,6 @@ dm_target_insert(dm_target_t *dm_target)
printf("%s missing sync\n", dm_target->name);
return EINVAL;
}
- if (dm_target->secsize == NULL) {
- printf("%s missing secsize\n", dm_target->name);
- return EINVAL;
- }
mutex_enter(&dm_target_mutex);
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.21 src/sys/dev/dm/dm_target_error.c:1.22
--- src/sys/dev/dm/dm_target_error.c:1.21 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target_error.c Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.21 2019/12/15 05:56:02 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.22 2019/12/15 09:42:29 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.21 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.22 2019/12/15 09:42:29 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -88,7 +88,6 @@ dm_target_error_modcmd(modcmd_t cmd, voi
dmt->deps = &dm_target_error_deps;
dmt->destroy = &dm_target_error_destroy;
dmt->upcall = &dm_target_error_upcall;
- dmt->secsize = dm_target_dummy_secsize;
r = dm_target_insert(dmt);
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.20 src/sys/dev/dm/dm_target_mirror.c:1.21
--- src/sys/dev/dm/dm_target_mirror.c:1.20 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target_mirror.c Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.20 2019/12/15 05:56:02 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.21 2019/12/15 09:42:29 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.20 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.21 2019/12/15 09:42:29 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -100,7 +100,6 @@ dm_target_mirror_modcmd(modcmd_t cmd, vo
dmt->deps = &dm_target_mirror_deps;
dmt->destroy = &dm_target_mirror_destroy;
dmt->upcall = &dm_target_mirror_upcall;
- dmt->secsize = dm_target_dummy_secsize;
r = dm_target_insert(dmt);
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.32 src/sys/dev/dm/dm_target_snapshot.c:1.33
--- src/sys/dev/dm/dm_target_snapshot.c:1.32 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.32 2019/12/15 05:56:02 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.33 2019/12/15 09:42:29 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.32 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.33 2019/12/15 09:42:29 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -163,7 +163,6 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
dmt->deps = &dm_target_snapshot_deps;
dmt->destroy = &dm_target_snapshot_destroy;
dmt->upcall = &dm_target_snapshot_upcall;
- dmt->secsize = dm_target_dummy_secsize;
r = dm_target_insert(dmt);
@@ -177,7 +176,6 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
dmt1->deps = &dm_target_snapshot_orig_deps;
dmt1->destroy = &dm_target_snapshot_orig_destroy;
dmt1->upcall = &dm_target_snapshot_orig_upcall;
- dmt1->secsize = dm_target_dummy_secsize;
r = dm_target_insert(dmt1);
break;
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.23 src/sys/dev/dm/dm_target_zero.c:1.24
--- src/sys/dev/dm/dm_target_zero.c:1.23 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target_zero.c Sun Dec 15 09:42:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.23 2019/12/15 05:56:02 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.24 2019/12/15 09:42:29 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.23 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.24 2019/12/15 09:42:29 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -88,7 +88,6 @@ dm_target_zero_modcmd(modcmd_t cmd, void
dmt->deps = &dm_target_zero_deps;
dmt->destroy = &dm_target_zero_destroy;
dmt->upcall = &dm_target_zero_upcall;
- dmt->secsize = dm_target_dummy_secsize;
r = dm_target_insert(dmt);
break;
