Module Name: src
Committed By: tkusumi
Date: Sat Dec 7 15:28:39 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_dev.c dm_pdev.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
src/sys/dev/dm/doc: locking.txt
Log Message:
dm: Fix strange pointer declarations
Should be "type *name" or "type* name", but not "type * name".
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dm/dm_dev.c \
src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dm/dm_pdev.c \
src/sys/dev/dm/dm_target_zero.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dm/dm_target.c \
src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dm/doc/locking.txt
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.33 src/sys/dev/dm/dm.h:1.34
--- src/sys/dev/dm/dm.h:1.33 Thu Dec 5 15:52:39 2019
+++ src/sys/dev/dm/dm.h Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.33 2019/12/05 15:52:39 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.34 2019/12/07 15:28:39 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -276,7 +276,7 @@ int dm_target_init(void);
/* dm_target_linear.c */
int dm_target_linear_init(dm_dev_t *, void**, char *);
-char * dm_target_linear_status(void *);
+char *dm_target_linear_status(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);
@@ -289,7 +289,7 @@ uint64_t atoi(const char *);
/* dm_target_stripe.c */
int dm_target_stripe_init(dm_dev_t *, void**, char *);
-char * dm_target_stripe_status(void *);
+char *dm_target_stripe_status(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);
@@ -305,7 +305,7 @@ int dm_table_destroy(dm_table_head_t *,
uint64_t dm_table_size(dm_table_head_t *);
uint64_t dm_inactive_table_size(dm_table_head_t *);
void dm_table_disksize(dm_table_head_t *, uint64_t *, unsigned *);
-dm_table_t * dm_table_get_entry(dm_table_head_t *, uint8_t);
+dm_table_t *dm_table_get_entry(dm_table_head_t *, uint8_t);
int dm_table_get_target_count(dm_table_head_t *, uint8_t);
void dm_table_release(dm_table_head_t *, uint8_t s);
void dm_table_switch_tables(dm_table_head_t *);
Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.13 src/sys/dev/dm/dm_dev.c:1.14
--- src/sys/dev/dm/dm_dev.c:1.13 Wed Dec 4 15:31:12 2019
+++ src/sys/dev/dm/dm_dev.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_dev.c,v 1.13 2019/12/04 15:31:12 tkusumi Exp $ */
+/* $NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 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_dev.c,v 1.13 2019/12/04 15:31:12 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -54,7 +54,7 @@ static kmutex_t dm_dev_mutex;
/* dm_dev_mutex must be holdby caller before using disable_dev. */
__inline static void
-disable_dev(dm_dev_t * dmv)
+disable_dev(dm_dev_t *dmv)
{
TAILQ_REMOVE(&dm_dev_list, dmv, next_devlist);
mutex_enter(&dmv->dev_mtx);
@@ -175,7 +175,7 @@ dm_dev_lookup_uuid(const char *dm_dev_uu
* Insert new device to the global list of devices.
*/
int
-dm_dev_insert(dm_dev_t * dev)
+dm_dev_insert(dm_dev_t *dev)
{
dm_dev_t *dmv;
int r;
@@ -331,7 +331,7 @@ dm_dev_alloc(void)
* Freed device entry.
*/
int
-dm_dev_free(dm_dev_t * dmv)
+dm_dev_free(dm_dev_t *dmv)
{
KASSERT(dmv != NULL);
@@ -348,7 +348,7 @@ dm_dev_free(dm_dev_t * dmv)
}
void
-dm_dev_busy(dm_dev_t * dmv)
+dm_dev_busy(dm_dev_t *dmv)
{
mutex_enter(&dmv->dev_mtx);
dmv->ref_cnt++;
@@ -356,7 +356,7 @@ dm_dev_busy(dm_dev_t * dmv)
}
void
-dm_dev_unbusy(dm_dev_t * dmv)
+dm_dev_unbusy(dm_dev_t *dmv)
{
KASSERT(dmv->ref_cnt != 0);
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.13 src/sys/dev/dm/dm_target_mirror.c:1.14
--- src/sys/dev/dm/dm_target_mirror.c:1.13 Fri Dec 6 16:11:59 2019
+++ src/sys/dev/dm/dm_target_mirror.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.13 2019/12/06 16:11:59 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.14 2019/12/07 15:28:39 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.13 2019/12/06 16:11:59 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_mi
/* dm_target_mirror.c */
int dm_target_mirror_init(dm_dev_t *, void**, char *);
-char * dm_target_mirror_status(void *);
+char *dm_target_mirror_status(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);
@@ -114,7 +114,7 @@ dm_target_mirror_modcmd(modcmd_t cmd, vo
* 0 52428800 mirror clustered_disk 4 253:2 1024 UUID block_on_error 3 253:3 0 253:4 0 253:5 0
*/
int
-dm_target_mirror_init(dm_dev_t * dmv, void **target_config, char *argv)
+dm_target_mirror_init(dm_dev_t *dmv, void **target_config, char *argv)
{
printf("Mirror target init function called!!\n");
@@ -133,7 +133,7 @@ dm_target_mirror_status(void *target_con
/* Strategy routine called from dm_strategy. */
int
-dm_target_mirror_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_mirror_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
printf("Mirror target read function called!!\n");
@@ -148,7 +148,7 @@ dm_target_mirror_strategy(dm_table_entry
/* Sync underlying disk caches. */
int
-dm_target_mirror_sync(dm_table_entry_t * table_en)
+dm_target_mirror_sync(dm_table_entry_t *table_en)
{
return 0;
@@ -156,7 +156,7 @@ dm_target_mirror_sync(dm_table_entry_t *
/* Doesn't do anything here. */
int
-dm_target_mirror_destroy(dm_table_entry_t * table_en)
+dm_target_mirror_destroy(dm_table_entry_t *table_en)
{
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
@@ -166,14 +166,14 @@ dm_target_mirror_destroy(dm_table_entry_
/* Doesn't not need to do anything here. */
int
-dm_target_mirror_deps(dm_table_entry_t * table_en, prop_array_t prop_array)
+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)
+dm_target_mirror_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
Index: src/sys/dev/dm/dm_pdev.c
diff -u src/sys/dev/dm/dm_pdev.c:1.17 src/sys/dev/dm/dm_pdev.c:1.18
--- src/sys/dev/dm/dm_pdev.c:1.17 Sat Dec 7 06:26:31 2019
+++ src/sys/dev/dm/dm_pdev.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_pdev.c,v 1.17 2019/12/07 06:26:31 tkusumi Exp $ */
+/* $NetBSD: dm_pdev.c,v 1.18 2019/12/07 15:28:39 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_pdev.c,v 1.17 2019/12/07 06:26:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.18 2019/12/07 15:28:39 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -167,7 +167,7 @@ dm_pdev_alloc(const char *name)
* Destroy allocated dm_pdev.
*/
static int
-dm_pdev_rem(dm_pdev_t * dmp)
+dm_pdev_rem(dm_pdev_t *dmp)
{
KASSERT(dmp != NULL);
@@ -216,7 +216,7 @@ dm_pdev_destroy(void)
* Decrement pdev reference counter if 0 remove it.
*/
int
-dm_pdev_decr(dm_pdev_t * dmp)
+dm_pdev_decr(dm_pdev_t *dmp)
{
KASSERT(dmp != NULL);
/*
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.17 src/sys/dev/dm/dm_target_zero.c:1.18
--- src/sys/dev/dm/dm_target_zero.c:1.17 Fri Dec 6 16:46:14 2019
+++ src/sys/dev/dm/dm_target_zero.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.17 2019/12/06 16:46:14 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.18 2019/12/07 15:28:39 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.17 2019/12/06 16:46:14 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.18 2019/12/07 15:28:39 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_ze
/* dm_target_zero.c */
int dm_target_zero_init(dm_dev_t *, void**, char *);
-char * dm_target_zero_status(void *);
+char *dm_target_zero_status(void *);
int dm_target_zero_strategy(dm_table_entry_t *, struct buf *);
int dm_target_zero_sync(dm_table_entry_t *);
int dm_target_zero_destroy(dm_table_entry_t *);
@@ -113,7 +113,7 @@ dm_target_zero_modcmd(modcmd_t cmd, void
* target specific config area.
*/
int
-dm_target_zero_init(dm_dev_t * dmv, void **target_config, char *argv)
+dm_target_zero_init(dm_dev_t *dmv, void **target_config, char *argv)
{
printf("Zero target init function called!!\n");
@@ -135,7 +135,7 @@ dm_target_zero_status(void *target_confi
* This routine does IO operations.
*/
int
-dm_target_zero_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_zero_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
/* printf("Zero target read function called %d!!\n", bp->b_bcount); */
@@ -151,7 +151,7 @@ dm_target_zero_strategy(dm_table_entry_t
/* Sync underlying disk caches. */
int
-dm_target_zero_sync(dm_table_entry_t * table_en)
+dm_target_zero_sync(dm_table_entry_t *table_en)
{
return 0;
@@ -159,7 +159,7 @@ dm_target_zero_sync(dm_table_entry_t * t
/* Does not need to do anything here. */
int
-dm_target_zero_destroy(dm_table_entry_t * table_en)
+dm_target_zero_destroy(dm_table_entry_t *table_en)
{
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
@@ -169,14 +169,14 @@ dm_target_zero_destroy(dm_table_entry_t
/* Does not need to do anything here. */
int
-dm_target_zero_deps(dm_table_entry_t * table_en, prop_array_t prop_array)
+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)
+dm_target_zero_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.11 src/sys/dev/dm/dm_table.c:1.12
--- src/sys/dev/dm/dm_table.c:1.11 Sat Dec 7 06:26:31 2019
+++ src/sys/dev/dm/dm_table.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.11 2019/12/07 06:26:31 tkusumi Exp $ */
+/* $NetBSD: dm_table.c,v 1.12 2019/12/07 15:28:39 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.11 2019/12/07 06:26:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.12 2019/12/07 15:28:39 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -63,7 +63,7 @@ static void dm_table_unbusy(dm_table_hea
* DM_TABLE_INACTIVE will return inactive table id.
*/
static int
-dm_table_busy(dm_table_head_t * head, uint8_t table_id)
+dm_table_busy(dm_table_head_t *head, uint8_t table_id)
{
uint8_t id;
@@ -84,7 +84,7 @@ dm_table_busy(dm_table_head_t * head, ui
* Function release table lock and eventually wakeup all waiters.
*/
static void
-dm_table_unbusy(dm_table_head_t * head)
+dm_table_unbusy(dm_table_head_t *head)
{
KASSERT(head->io_cnt != 0);
@@ -100,7 +100,7 @@ dm_table_unbusy(dm_table_head_t * head)
* Return current active table to caller, increment io_cnt reference counter.
*/
dm_table_t *
-dm_table_get_entry(dm_table_head_t * head, uint8_t table_id)
+dm_table_get_entry(dm_table_head_t *head, uint8_t table_id)
{
uint8_t id;
@@ -112,7 +112,7 @@ dm_table_get_entry(dm_table_head_t * hea
* Decrement io reference counter and wake up all callers, with table_head cv.
*/
void
-dm_table_release(dm_table_head_t * head, uint8_t table_id)
+dm_table_release(dm_table_head_t *head, uint8_t table_id)
{
dm_table_unbusy(head);
}
@@ -121,7 +121,7 @@ dm_table_release(dm_table_head_t * head,
* Switch table from inactive to active mode. Have to wait until io_cnt is 0.
*/
void
-dm_table_switch_tables(dm_table_head_t * head)
+dm_table_switch_tables(dm_table_head_t *head)
{
mutex_enter(&head->table_mtx);
@@ -140,7 +140,7 @@ dm_table_switch_tables(dm_table_head_t *
* XXX Is it ok to call kmem_free and potentialy VOP_CLOSE with held mutex ?xs
*/
int
-dm_table_destroy(dm_table_head_t * head, uint8_t table_id)
+dm_table_destroy(dm_table_head_t *head, uint8_t table_id)
{
dm_table_t *tbl;
dm_table_entry_t *table_en;
@@ -178,7 +178,7 @@ dm_table_destroy(dm_table_head_t * head,
* Return length of active table in device.
*/
static inline uint64_t
-dm_table_size_impl(dm_table_head_t * head, int table)
+dm_table_size_impl(dm_table_head_t *head, int table)
{
dm_table_t *tbl;
dm_table_entry_t *table_en;
@@ -208,7 +208,7 @@ dm_table_size_impl(dm_table_head_t * hea
* Return length of active table in device.
*/
uint64_t
-dm_table_size(dm_table_head_t * head)
+dm_table_size(dm_table_head_t *head)
{
return dm_table_size_impl(head, DM_TABLE_ACTIVE);
}
@@ -217,7 +217,7 @@ dm_table_size(dm_table_head_t * head)
* Return length of active table in device.
*/
uint64_t
-dm_inactive_table_size(dm_table_head_t * head)
+dm_inactive_table_size(dm_table_head_t *head)
{
return dm_table_size_impl(head, DM_TABLE_INACTIVE);
}
@@ -226,7 +226,7 @@ dm_inactive_table_size(dm_table_head_t *
* Return combined disk geometry
*/
void
-dm_table_disksize(dm_table_head_t * head, uint64_t *numsecp, unsigned *secsizep)
+dm_table_disksize(dm_table_head_t *head, uint64_t *numsecp, unsigned *secsizep)
{
dm_table_t *tbl;
dm_table_entry_t *table_en;
@@ -265,7 +265,7 @@ dm_table_disksize(dm_table_head_t * head
* there can be dm_dev_resume_ioctl), therfore this isonly informative.
*/
int
-dm_table_get_target_count(dm_table_head_t * head, uint8_t table_id)
+dm_table_get_target_count(dm_table_head_t *head, uint8_t table_id)
{
dm_table_entry_t *table_en;
dm_table_t *tbl;
@@ -292,7 +292,7 @@ dm_table_get_target_count(dm_table_head_
* opaque as possible.
*/
void
-dm_table_head_init(dm_table_head_t * head)
+dm_table_head_init(dm_table_head_t *head)
{
head->cur_active_table = 0;
head->io_cnt = 0;
@@ -309,7 +309,7 @@ dm_table_head_init(dm_table_head_t * hea
* Destroy all variables in table_head
*/
void
-dm_table_head_destroy(dm_table_head_t * head)
+dm_table_head_destroy(dm_table_head_t *head)
{
KASSERT(!mutex_owned(&head->table_mtx));
KASSERT(!cv_has_waiters(&head->table_cv));
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.24 src/sys/dev/dm/dm_target.c:1.25
--- src/sys/dev/dm/dm_target.c:1.24 Sat Dec 7 06:26:31 2019
+++ src/sys/dev/dm/dm_target.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.24 2019/12/07 06:26:31 tkusumi Exp $ */
+/* $NetBSD: dm_target.c,v 1.25 2019/12/07 15:28:39 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.24 2019/12/07 06:26:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.25 2019/12/07 15:28:39 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -54,7 +54,7 @@ static kmutex_t dm_target_mutex;
* Called indirectly from dm_table_load_ioctl to mark target as used.
*/
void
-dm_target_busy(dm_target_t * target)
+dm_target_busy(dm_target_t *target)
{
atomic_inc_32(&target->ref_cnt);
}
@@ -63,7 +63,7 @@ dm_target_busy(dm_target_t * target)
* Release reference counter on target.
*/
void
-dm_target_unbusy(dm_target_t * target)
+dm_target_unbusy(dm_target_t *target)
{
KASSERT(target->ref_cnt > 0);
atomic_dec_32(&target->ref_cnt);
@@ -151,7 +151,7 @@ dm_target_lookup_name(const char *dm_tar
* contains name, version, function pointer to specifif target functions.
*/
int
-dm_target_insert(dm_target_t * dm_target)
+dm_target_insert(dm_target_t *dm_target)
{
dm_target_t *dmt;
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.24 src/sys/dev/dm/dm_target_snapshot.c:1.25
--- src/sys/dev/dm/dm_target_snapshot.c:1.24 Fri Dec 6 16:11:59 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.24 2019/12/06 16:11:59 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.25 2019/12/07 15:28:39 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.24 2019/12/06 16:11:59 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.25 2019/12/07 15:28:39 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_sn
/* dm_target_snapshot.c */
int dm_target_snapshot_init(dm_dev_t *, void**, char *);
-char * dm_target_snapshot_status(void *);
+char *dm_target_snapshot_status(void *);
int dm_target_snapshot_strategy(dm_table_entry_t *, struct buf *);
int dm_target_snapshot_deps(dm_table_entry_t *, prop_array_t);
int dm_target_snapshot_destroy(dm_table_entry_t *);
@@ -96,7 +96,7 @@ int dm_target_snapshot_upcall(dm_table_e
/* dm snapshot origin driver */
int dm_target_snapshot_orig_init(dm_dev_t *, void**, char *);
-char * dm_target_snapshot_orig_status(void *);
+char *dm_target_snapshot_orig_status(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);
@@ -192,7 +192,7 @@ dm_target_snapshot_modcmd(modcmd_t cmd,
* snapshot_origin device, cow device, persistent flag, chunk size
*/
int
-dm_target_snapshot_init(dm_dev_t * dmv, void **target_config, char *params)
+dm_target_snapshot_init(dm_dev_t *dmv, void **target_config, char *params)
{
dm_target_snapshot_config_t *tsc;
dm_pdev_t *dmp_snap, *dmp_cow;
@@ -295,7 +295,7 @@ dm_target_snapshot_status(void *target_c
/* Strategy routine called from dm_strategy. */
int
-dm_target_snapshot_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_snapshot_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
printf("Snapshot target read function called!!\n");
@@ -310,7 +310,7 @@ dm_target_snapshot_strategy(dm_table_ent
/* Doesn't do anything here. */
int
-dm_target_snapshot_destroy(dm_table_entry_t * table_en)
+dm_target_snapshot_destroy(dm_table_entry_t *table_en)
{
/*
@@ -339,8 +339,7 @@ out:
/* 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_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
{
dm_target_snapshot_config_t *tsc;
@@ -362,7 +361,7 @@ dm_target_snapshot_deps(dm_table_entry_t
/* Upcall is used to inform other depended devices about IO. */
int
-dm_target_snapshot_upcall(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_snapshot_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
printf("dm_target_snapshot_upcall called\n");
@@ -388,7 +387,7 @@ dm_target_snapshot_upcall(dm_table_entry
* argv: /dev/mapper/my_data_real
*/
int
-dm_target_snapshot_orig_init(dm_dev_t * dmv, void **target_config, char *params)
+dm_target_snapshot_orig_init(dm_dev_t *dmv, void **target_config, char *params)
{
dm_target_snapshot_origin_config_t *tsoc;
dm_pdev_t *dmp_real;
@@ -446,7 +445,7 @@ dm_target_snapshot_orig_status(void *tar
/* Strategy routine called from dm_strategy. */
int
-dm_target_snapshot_orig_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_snapshot_orig_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
printf("Snapshot_Orig target read function called!!\n");
@@ -463,7 +462,7 @@ dm_target_snapshot_orig_strategy(dm_tabl
* Sync underlying disk caches.
*/
int
-dm_target_snapshot_orig_sync(dm_table_entry_t * table_en)
+dm_target_snapshot_orig_sync(dm_table_entry_t *table_en)
{
int cmd;
dm_target_snapshot_origin_config_t *tsoc;
@@ -478,7 +477,7 @@ dm_target_snapshot_orig_sync(dm_table_en
/* Decrement pdev and free allocated space. */
int
-dm_target_snapshot_orig_destroy(dm_table_entry_t * table_en)
+dm_target_snapshot_orig_destroy(dm_table_entry_t *table_en)
{
/*
@@ -506,7 +505,7 @@ out:
* Get target deps and add them to prop_array_t.
*/
int
-dm_target_snapshot_orig_deps(dm_table_entry_t * table_en,
+dm_target_snapshot_orig_deps(dm_table_entry_t *table_en,
prop_array_t prop_array)
{
dm_target_snapshot_origin_config_t *tsoc;
@@ -533,7 +532,7 @@ dm_target_snapshot_orig_deps(dm_table_en
/* Unsupported for this target. */
int
-dm_target_snapshot_orig_upcall(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_snapshot_orig_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.15 src/sys/dev/dm/dm_target_error.c:1.16
--- src/sys/dev/dm/dm_target_error.c:1.15 Fri Dec 6 16:11:59 2019
+++ src/sys/dev/dm/dm_target_error.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.15 2019/12/06 16:11:59 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.16 2019/12/07 15:28:39 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.15 2019/12/06 16:11:59 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.16 2019/12/07 15:28:39 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_er
/* dm_target_error.c */
int dm_target_error_init(dm_dev_t *, void**, char *);
-char * dm_target_error_status(void *);
+char *dm_target_error_status(void *);
int dm_target_error_strategy(dm_table_entry_t *, struct buf *);
int dm_target_error_sync(dm_table_entry_t *);
int dm_target_error_deps(dm_table_entry_t *, prop_array_t);
@@ -110,7 +110,7 @@ dm_target_error_modcmd(modcmd_t cmd, voi
/* Init function called from dm_table_load_ioctl. */
int
-dm_target_error_init(dm_dev_t * dmv, void **target_config, char *argv)
+dm_target_error_init(dm_dev_t *dmv, void **target_config, char *argv)
{
printf("Error target init function called!!\n");
@@ -129,7 +129,7 @@ dm_target_error_status(void *target_conf
/* Strategy routine called from dm_strategy. */
int
-dm_target_error_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_error_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
printf("Error target read function called!!\n");
@@ -144,7 +144,7 @@ dm_target_error_strategy(dm_table_entry_
/* Sync underlying disk caches. */
int
-dm_target_error_sync(dm_table_entry_t * table_en)
+dm_target_error_sync(dm_table_entry_t *table_en)
{
return 0;
@@ -152,7 +152,7 @@ dm_target_error_sync(dm_table_entry_t *
/* Doesn't do anything here. */
int
-dm_target_error_destroy(dm_table_entry_t * table_en)
+dm_target_error_destroy(dm_table_entry_t *table_en)
{
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
@@ -162,14 +162,14 @@ dm_target_error_destroy(dm_table_entry_t
/* Doesn't not need to do anything here. */
int
-dm_target_error_deps(dm_table_entry_t * table_en, prop_array_t prop_array)
+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)
+dm_target_error_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.23 src/sys/dev/dm/dm_target_linear.c:1.24
--- src/sys/dev/dm/dm_target_linear.c:1.23 Fri Dec 6 16:46:14 2019
+++ src/sys/dev/dm/dm_target_linear.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.23 2019/12/06 16:46:14 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.24 2019/12/07 15:28:39 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.23 2019/12/06 16:46:14 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.24 2019/12/07 15:28:39 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_li
* @argv[1] is physical data offset.
*/
int
-dm_target_linear_init(dm_dev_t * dmv, void **target_config, char *params)
+dm_target_linear_init(dm_dev_t *dmv, void **target_config, char *params)
{
dm_target_linear_config_t *tlc;
dm_pdev_t *dmp;
@@ -117,7 +117,7 @@ dm_target_linear_status(void *target_con
* Do IO operation, called from dmstrategy routine.
*/
int
-dm_target_linear_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_linear_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
dm_target_linear_config_t *tlc;
@@ -138,7 +138,7 @@ dm_target_linear_strategy(dm_table_entry
* Sync underlying disk caches.
*/
int
-dm_target_linear_sync(dm_table_entry_t * table_en)
+dm_target_linear_sync(dm_table_entry_t *table_en)
{
int cmd;
dm_target_linear_config_t *tlc;
@@ -155,7 +155,7 @@ dm_target_linear_sync(dm_table_entry_t *
* Destroy target specific data. Decrement table pdevs.
*/
int
-dm_target_linear_destroy(dm_table_entry_t * table_en)
+dm_target_linear_destroy(dm_table_entry_t *table_en)
{
/*
@@ -180,7 +180,7 @@ out:
/* 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_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
{
dm_target_linear_config_t *tlc;
@@ -201,7 +201,7 @@ dm_target_linear_deps(dm_table_entry_t *
* mirror, snapshot, multipath, stripe will use this functionality.
*/
int
-dm_target_linear_upcall(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_linear_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
@@ -211,7 +211,7 @@ dm_target_linear_upcall(dm_table_entry_t
* For a linear target this is just the sector size of the underlying device
*/
int
-dm_target_linear_secsize(dm_table_entry_t * table_en, unsigned *secsizep)
+dm_target_linear_secsize(dm_table_entry_t *table_en, unsigned *secsizep)
{
dm_target_linear_config_t *tlc;
unsigned secsize;
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.29 src/sys/dev/dm/dm_target_stripe.c:1.30
--- src/sys/dev/dm/dm_target_stripe.c:1.29 Fri Dec 6 16:33:47 2019
+++ src/sys/dev/dm/dm_target_stripe.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.29 2019/12/06 16:33:47 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.30 2019/12/07 15:28:39 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.29 2019/12/06 16:33:47 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.30 2019/12/07 15:28:39 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -128,7 +128,7 @@ dm_target_stripe_fini(dm_target_stripe_c
* 0 65536 striped 2 512 /dev/hda 0 /dev/hdb 0
*/
int
-dm_target_stripe_init(dm_dev_t * dmv, void **target_config, char *params)
+dm_target_stripe_init(dm_dev_t *dmv, void **target_config, char *params)
{
dm_target_linear_config_t *tlc;
dm_target_stripe_config_t *tsc;
@@ -217,7 +217,7 @@ dm_target_stripe_status(void *target_con
/* Strategy routine called from dm_strategy. */
int
-dm_target_stripe_strategy(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_stripe_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
dm_target_linear_config_t *tlc;
dm_target_stripe_config_t *tsc;
@@ -283,7 +283,7 @@ dm_target_stripe_strategy(dm_table_entry
/* Sync underlying disk caches. */
int
-dm_target_stripe_sync(dm_table_entry_t * table_en)
+dm_target_stripe_sync(dm_table_entry_t *table_en)
{
int cmd, err;
dm_target_stripe_config_t *tsc;
@@ -306,7 +306,7 @@ dm_target_stripe_sync(dm_table_entry_t *
/* Destroy target specific data. */
int
-dm_target_stripe_destroy(dm_table_entry_t * table_en)
+dm_target_stripe_destroy(dm_table_entry_t *table_en)
{
dm_target_stripe_fini(table_en->target_config);
@@ -318,7 +318,7 @@ dm_target_stripe_destroy(dm_table_entry_
/* 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_deps(dm_table_entry_t *table_en, prop_array_t prop_array)
{
dm_target_stripe_config_t *tsc;
dm_target_linear_config_t *tlc;
@@ -338,7 +338,7 @@ dm_target_stripe_deps(dm_table_entry_t *
/* Unsupported for this target. */
int
-dm_target_stripe_upcall(dm_table_entry_t * table_en, struct buf * bp)
+dm_target_stripe_upcall(dm_table_entry_t *table_en, struct buf *bp)
{
return 0;
}
@@ -350,7 +350,7 @@ dm_target_stripe_upcall(dm_table_entry_t
* to the least common multiple.
*/
int
-dm_target_stripe_secsize(dm_table_entry_t * table_en, unsigned *secsizep)
+dm_target_stripe_secsize(dm_table_entry_t *table_en, unsigned *secsizep)
{
dm_target_linear_config_t *tlc;
dm_target_stripe_config_t *tsc;
Index: src/sys/dev/dm/doc/locking.txt
diff -u src/sys/dev/dm/doc/locking.txt:1.2 src/sys/dev/dm/doc/locking.txt:1.3
--- src/sys/dev/dm/doc/locking.txt:1.2 Sun Dec 1 06:53:32 2019
+++ src/sys/dev/dm/doc/locking.txt Sat Dec 7 15:28:39 2019
@@ -120,7 +120,7 @@ uint64_t dm_table_size(dm_table_head_t *
/*
* Return current active table to caller, increment io_cnt reference counter.
*/
-struct dm_table * dm_table_get_entry(dm_table_head_t *, uint8_t);
+struct dm_table *dm_table_get_entry(dm_table_head_t *, uint8_t);
/*
* Return > 0 if table is at least one table entry (returns number of entries)
