Sun Dec 8 10:50:21 2019 UTC ()
dm: Move targets specific structs to .c files
These don't need to be defined and exposed in dm.h.
(tkusumi)
diff -r1.36 -r1.37 src/sys/dev/dm/dm.h
diff -r1.15 -r1.16 src/sys/dev/dm/dm_target_mirror.c
diff -r1.27 -r1.28 src/sys/dev/dm/dm_target_snapshot.c
diff -r1.31 -r1.32 src/sys/dev/dm/dm_target_stripe.c
--- src/sys/dev/dm/dm.h 2019/12/08 10:35:53 1.36
+++ src/sys/dev/dm/dm.h 2019/12/08 10:50:21 1.37
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.36 2019/12/08 10:35:53 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.37 2019/12/08 10:50:21 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -169,45 +169,6 @@
TAILQ_HEAD(target_linear_devs, target_linear_config);
typedef struct target_linear_devs dm_target_linear_devs_t;
-
-/* for stripe : */
-typedef struct target_stripe_config {
-#define DM_STRIPE_DEV_OFFSET 2
- struct target_linear_devs stripe_devs;
- uint8_t stripe_num;
- uint64_t stripe_chunksize;
- size_t params_len;
-} dm_target_stripe_config_t;
-
-/* for mirror : */
-typedef struct target_mirror_config {
-#define MAX_MIRROR_COPIES 4
- dm_pdev_t *orig;
- dm_pdev_t *copies[MAX_MIRROR_COPIES];
-
- /* copied blocks bitmaps administration etc*/
- dm_pdev_t *log_pdev; /* for administration */
- uint64_t log_regionsize; /* blocksize of mirror */
-
- /* list of parts that still need copied etc.; run length encoded? */
-} dm_target_mirror_config_t;
-
-
-/* for snapshot : */
-typedef struct target_snapshot_config {
- dm_pdev_t *tsc_snap_dev;
- /* cow dev is set only for persistent snapshot devices */
- dm_pdev_t *tsc_cow_dev;
-
- uint64_t tsc_chunk_size;
- uint32_t tsc_persistent_dev;
-} dm_target_snapshot_config_t;
-
-/* for snapshot-origin devices */
-typedef struct target_snapshot_origin_config {
- dm_pdev_t *tsoc_real_dev;
- /* list of snapshots ? */
-} dm_target_snapshot_origin_config_t;
/* constant dm_target structures for error, zero, linear, stripes etc. */
typedef struct dm_target {
--- src/sys/dev/dm/dm_target_mirror.c 2019/12/08 04:41:02 1.15
+++ src/sys/dev/dm/dm_target_mirror.c 2019/12/08 10:50:21 1.16
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.15 2019/12/08 04:41:02 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.16 2019/12/08 10:50:21 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.15 2019/12/08 04:41:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.16 2019/12/08 10:50:21 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -49,6 +49,18 @@
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 *);
+
+typedef struct target_mirror_config {
+#define MAX_MIRROR_COPIES 4
+ dm_pdev_t *orig;
+ dm_pdev_t *copies[MAX_MIRROR_COPIES];
+
+ /* copied blocks bitmaps administration etc*/
+ dm_pdev_t *log_pdev; /* for administration */
+ uint64_t log_regionsize; /* blocksize of mirror */
+
+ /* list of parts that still need copied etc.; run length encoded? */
+} dm_target_mirror_config_t;
#ifdef DM_TARGET_MODULE
/*
--- src/sys/dev/dm/dm_target_snapshot.c 2019/12/08 10:35:53 1.27
+++ src/sys/dev/dm/dm_target_snapshot.c 2019/12/08 10:50:21 1.28
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.27 2019/12/08 10:35:53 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.28 2019/12/08 10:50:21 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.27 2019/12/08 10:35:53 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.28 2019/12/08 10:50:21 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -102,6 +102,20 @@
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 *);
+
+typedef struct target_snapshot_config {
+ dm_pdev_t *tsc_snap_dev;
+ /* cow dev is set only for persistent snapshot devices */
+ dm_pdev_t *tsc_cow_dev;
+
+ uint64_t tsc_chunk_size;
+ uint32_t tsc_persistent_dev;
+} dm_target_snapshot_config_t;
+
+typedef struct target_snapshot_origin_config {
+ dm_pdev_t *tsoc_real_dev;
+ /* list of snapshots ? */
+} dm_target_snapshot_origin_config_t;
#ifdef DM_TARGET_MODULE
/*
--- src/sys/dev/dm/dm_target_stripe.c 2019/12/08 04:41:02 1.31
+++ src/sys/dev/dm/dm_target_stripe.c 2019/12/08 10:50:21 1.32
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.31 2019/12/08 04:41:02 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.32 2019/12/08 10:50:21 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.31 2019/12/08 04:41:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.32 2019/12/08 10:50:21 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -42,6 +42,14 @@
#include <sys/lwp.h>
#include "dm.h"
+
+typedef struct target_stripe_config {
+#define DM_STRIPE_DEV_OFFSET 2
+ struct target_linear_devs stripe_devs;
+ uint8_t stripe_num;
+ uint64_t stripe_chunksize;
+ size_t params_len;
+} dm_target_stripe_config_t;
#ifdef DM_TARGET_MODULE
/*