Module Name: src
Committed By: tkusumi
Date: Wed Dec 4 15:31:12 UTC 2019
Modified Files:
src/sys/dev/dm: device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c
dm_table.c dm_target.c
Log Message:
dm: style + whitespace + indentation fixes
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dm/dm_dev.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dm/dm_pdev.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_target.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/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.42 src/sys/dev/dm/device-mapper.c:1.43
--- src/sys/dev/dm/device-mapper.c:1.42 Tue Dec 3 15:36:00 2019
+++ src/sys/dev/dm/device-mapper.c Wed Dec 4 15:31:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.42 2019/12/03 15:36:00 tkusumi Exp $ */
+/* $NetBSD: device-mapper.c,v 1.43 2019/12/04 15:31:12 tkusumi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@ static const struct cmd_function {
{ .cmd = "reload", .fn = dm_table_load_ioctl, .allowed = 0 },
{ .cmd = "status", .fn = dm_table_status_ioctl, .allowed = 1 },
{ .cmd = "table", .fn = dm_table_status_ioctl, .allowed = 1 },
- { .cmd = NULL, .fn = NULL, .allowed = 0 }
+ { .cmd = NULL, .fn = NULL, .allowed = 0 }
};
#ifdef _MODULE
@@ -194,11 +194,8 @@ dm_modcmd(modcmd_t cmd, void *arg)
config_cfdriver_detach(&dm_cd);
break;
}
-
dm_doinit();
-
break;
-
case MODULE_CMD_FINI:
/*
* Disable unloading of dm module if there are any devices
@@ -220,7 +217,6 @@ dm_modcmd(modcmd_t cmd, void *arg)
break;
case MODULE_CMD_STAT:
return ENOTTY;
-
default:
return ENOTTY;
}
@@ -364,7 +360,7 @@ dmioctl(dev_t dev, const u_long cmd, voi
aprint_debug("dmioctl called\n");
KASSERT(data != NULL);
- if (( r = disk_ioctl_switch(dev, cmd, data)) == ENOTTY) {
+ if ((r = disk_ioctl_switch(dev, cmd, data)) == ENOTTY) {
struct plistref *pref = (struct plistref *) data;
/* Check if we were called with NETBSD_DM_IOCTL ioctl
@@ -429,7 +425,6 @@ dm_ioctl_switch(u_long cmd)
{
switch(cmd) {
-
case NETBSD_DM_IOCTL:
aprint_debug("dm NetBSD_DM_IOCTL called\n");
break;
@@ -511,8 +506,7 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
* Call sync target routine for all table entries. Target sync
* routine basically call DIOCCACHESYNC on underlying devices.
*/
- SLIST_FOREACH(table_en, tbl, next)
- {
+ SLIST_FOREACH(table_en, tbl, next) {
(void)table_en->target->sync(table_en);
}
dm_table_release(&dmv->table_head, DM_TABLE_ACTIVE);
@@ -556,7 +550,6 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
break;
}
-
default:
aprint_debug("unknown disk_ioctl called\n");
return ENOTTY;
@@ -622,8 +615,7 @@ dmstrategy(struct buf *bp)
/*
* Find out what tables I want to select.
*/
- SLIST_FOREACH(table_en, tbl, next)
- {
+ SLIST_FOREACH(table_en, tbl, next) {
/* I need need number of bytes not blocks. */
table_start = table_en->start * DEV_BSIZE;
/*
@@ -672,8 +664,6 @@ dmstrategy(struct buf *bp)
dm_table_release(&dmv->table_head, DM_TABLE_ACTIVE);
dm_dev_unbusy(dmv);
-
- return;
}
@@ -697,15 +687,13 @@ dmsize(dev_t dev)
dm_dev_t *dmv;
uint64_t size;
- size = 0;
-
if ((dmv = dm_dev_lookup(NULL, NULL, minor(dev))) == NULL)
- return -ENOENT;
+ return -ENOENT;
size = dm_table_size(&dmv->table_head);
dm_dev_unbusy(dmv);
- return size;
+ return size;
}
static void
Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.12 src/sys/dev/dm/dm_dev.c:1.13
--- src/sys/dev/dm/dm_dev.c:1.12 Tue Dec 3 16:22:01 2019
+++ src/sys/dev/dm/dm_dev.c Wed Dec 4 15:31:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_dev.c,v 1.12 2019/12/03 16:22:01 tkusumi Exp $ */
+/* $NetBSD: dm_dev.c,v 1.13 2019/12/04 15:31:12 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.12 2019/12/03 16:22:01 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.13 2019/12/04 15:31:12 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -133,7 +133,6 @@ dm_dev_lookup_name(const char *dm_dev_na
return NULL;
TAILQ_FOREACH(dmv, &dm_dev_list, next_devlist) {
-
dlen = strlen(dmv->name);
if (slen != dlen)
@@ -162,7 +161,6 @@ dm_dev_lookup_uuid(const char *dm_dev_uu
return NULL;
TAILQ_FOREACH(dmv, &dm_dev_list, next_devlist) {
-
if (strlen(dmv->uuid) != len)
continue;
@@ -190,9 +188,7 @@ dm_dev_insert(dm_dev_t * dev)
if (((dmv = dm_dev_lookup_uuid(dev->uuid)) == NULL) &&
((dmv = dm_dev_lookup_name(dev->name)) == NULL) &&
((dmv = dm_dev_lookup_minor(dev->minor)) == NULL)) {
-
TAILQ_INSERT_TAIL(&dm_dev_list, dev, next_devlist);
-
} else
r = EEXIST;
@@ -288,7 +284,6 @@ dm_dev_destroy(void)
mutex_enter(&dm_dev_mutex);
while (TAILQ_FIRST(&dm_dev_list) != NULL) {
-
dmv = TAILQ_FIRST(&dm_dev_list);
TAILQ_REMOVE(&dm_dev_list, TAILQ_FIRST(&dm_dev_list),
@@ -311,7 +306,7 @@ dm_dev_destroy(void)
mutex_destroy(&dmv->dev_mtx);
cv_destroy(&dmv->dev_cv);
- (void) kmem_free(dmv, sizeof(dm_dev_t));
+ (void)kmem_free(dmv, sizeof(dm_dev_t));
}
mutex_exit(&dm_dev_mutex);
@@ -345,9 +340,9 @@ dm_dev_free(dm_dev_t * dmv)
cv_destroy(&dmv->dev_cv);
if (dmv->diskp != NULL)
- (void) kmem_free(dmv->diskp, sizeof(struct disk));
+ (void)kmem_free(dmv->diskp, sizeof(struct disk));
- (void) kmem_free(dmv, sizeof(dm_dev_t));
+ (void)kmem_free(dmv, sizeof(dm_dev_t));
return 0;
}
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.36 src/sys/dev/dm/dm_ioctl.c:1.37
--- src/sys/dev/dm/dm_ioctl.c:1.36 Tue Dec 3 15:47:38 2019
+++ src/sys/dev/dm/dm_ioctl.c Wed Dec 4 15:31:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.36 2019/12/03 15:47:38 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.37 2019/12/04 15:31:12 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.36 2019/12/03 15:47:38 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.37 2019/12/04 15:31:12 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -297,7 +297,6 @@ int
dm_dev_list_ioctl(prop_dictionary_t dm_dict)
{
prop_array_t dev_list;
-
uint32_t flags;
flags = 0;
@@ -452,9 +451,9 @@ dm_dev_status_ioctl(prop_dictionary_t dm
* Add status flags for tables I have to check both active and
* inactive tables.
*/
- if ((j = dm_table_get_target_count(&dmv->table_head, DM_TABLE_ACTIVE))) {
+ if ((j = dm_table_get_target_count(&dmv->table_head, DM_TABLE_ACTIVE)))
DM_ADD_FLAG(flags, DM_ACTIVE_PRESENT_FLAG);
- } else
+ else
DM_REMOVE_FLAG(flags, DM_ACTIVE_PRESENT_FLAG);
prop_dictionary_set_uint32(dm_dict, DM_IOCTL_TARGET_COUNT, j);
@@ -665,7 +664,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);
+ table_en->target->deps(table_en, cmd_array);
dm_table_release(&dmv->table_head, table_type);
dm_dev_unbusy(dmv);
@@ -699,9 +698,7 @@ dm_table_load_ioctl(prop_dictionary_t dm
prop_dictionary_t target_dict;
const char *name, *uuid, *type;
-
uint32_t flags, ret, minor;
-
char *str;
ret = 0;
@@ -749,7 +746,6 @@ dm_table_load_ioctl(prop_dictionary_t dm
prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor);
while ((target_dict = prop_object_iterator_next(iter)) != NULL) {
-
prop_dictionary_get_cstring_nocopy(target_dict,
DM_TABLE_TYPE, &type);
/*
@@ -797,7 +793,6 @@ dm_table_load_ioctl(prop_dictionary_t dm
if ((ret = target->init(dmv, &table_en->target_config,
str)) != 0) {
-
dm_table_release(&dmv->table_head, DM_TABLE_INACTIVE);
dm_table_destroy(&dmv->table_head, DM_TABLE_INACTIVE);
free(str, M_TEMP);
@@ -885,16 +880,15 @@ dm_table_status_ioctl(prop_dictionary_t
else
table_type = DM_TABLE_ACTIVE;
- if (dm_table_get_target_count(&dmv->table_head, DM_TABLE_ACTIVE))
+ if (dm_table_get_target_count(&dmv->table_head, DM_TABLE_ACTIVE)) {
DM_ADD_FLAG(flags, DM_ACTIVE_PRESENT_FLAG);
- else {
+ } else {
DM_REMOVE_FLAG(flags, DM_ACTIVE_PRESENT_FLAG);
if (dm_table_get_target_count(&dmv->table_head, DM_TABLE_INACTIVE))
DM_ADD_FLAG(flags, DM_INACTIVE_PRESENT_FLAG);
- else {
+ else
DM_REMOVE_FLAG(flags, DM_INACTIVE_PRESENT_FLAG);
- }
}
if (dmv->flags & DM_SUSPEND_FLAG)
Index: src/sys/dev/dm/dm_pdev.c
diff -u src/sys/dev/dm/dm_pdev.c:1.13 src/sys/dev/dm/dm_pdev.c:1.14
--- src/sys/dev/dm/dm_pdev.c:1.13 Tue Dec 3 16:22:01 2019
+++ src/sys/dev/dm/dm_pdev.c Wed Dec 4 15:31:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_pdev.c,v 1.13 2019/12/03 16:22:01 tkusumi Exp $ */
+/* $NetBSD: dm_pdev.c,v 1.14 2019/12/04 15:31:12 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.13 2019/12/03 16:22:01 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.14 2019/12/04 15:31:12 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -192,7 +192,6 @@ dm_pdev_destroy(void)
mutex_enter(&dm_pdev_mutex);
while (!SLIST_EMPTY(&dm_pdev_list)) { /* List Deletion. */
-
dm_pdev = SLIST_FIRST(&dm_pdev_list);
SLIST_REMOVE_HEAD(&dm_pdev_list, next_pdev);
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.8 src/sys/dev/dm/dm_table.c:1.9
--- src/sys/dev/dm/dm_table.c:1.8 Fri Jan 5 14:22:26 2018
+++ src/sys/dev/dm/dm_table.c Wed Dec 4 15:31:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.8 2018/01/05 14:22:26 christos Exp $ */
+/* $NetBSD: dm_table.c,v 1.9 2019/12/04 15:31:12 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.8 2018/01/05 14:22:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.9 2019/12/04 15:31:12 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -67,8 +67,6 @@ dm_table_busy(dm_table_head_t * head, ui
{
uint8_t id;
- id = 0;
-
mutex_enter(&head->table_mtx);
if (table_id == DM_TABLE_ACTIVE)
@@ -203,7 +201,7 @@ dm_table_size_impl(dm_table_head_t * hea
* if length => rawblkno then we should used that table.
*/
SLIST_FOREACH(table_en, tbl, next)
- length += table_en->length;
+ length += table_en->length;
dm_table_unbusy(head);
@@ -253,10 +251,10 @@ dm_table_disksize(dm_table_head_t * head
*/
secsize = 0;
SLIST_FOREACH(table_en, tbl, next) {
- length += table_en->length;
- (void)table_en->target->secsize(table_en, &tsecsize);
- if (secsize < tsecsize)
- secsize = tsecsize;
+ length += table_en->length;
+ (void)table_en->target->secsize(table_en, &tsecsize);
+ if (secsize < tsecsize)
+ secsize = tsecsize;
}
*numsecp = secsize > 0 ? dbtob(length) / secsize : 0;
*secsizep = secsize;
@@ -285,7 +283,7 @@ dm_table_get_target_count(dm_table_head_
tbl = &head->tables[id];
SLIST_FOREACH(table_en, tbl, next)
- target_count++;
+ target_count++;
dm_table_unbusy(head);
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.21 src/sys/dev/dm/dm_target.c:1.22
--- src/sys/dev/dm/dm_target.c:1.21 Tue Dec 3 16:22:01 2019
+++ src/sys/dev/dm/dm_target.c Wed Dec 4 15:31:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.21 2019/12/03 16:22:01 tkusumi Exp $ */
+/* $NetBSD: dm_target.c,v 1.22 2019/12/04 15:31:12 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.21 2019/12/03 16:22:01 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.22 2019/12/04 15:31:12 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -87,7 +87,7 @@ dm_target_autoload(const char *dm_target
gen = module_gen;
/* Try to autoload target module */
- (void) module_autoload(name, MODULE_CLASS_MISC);
+ (void)module_autoload(name, MODULE_CLASS_MISC);
} while (gen != module_gen);
mutex_enter(&dm_target_mutex);
@@ -107,8 +107,6 @@ dm_target_lookup(const char *dm_target_n
{
dm_target_t *dmt;
- dmt = NULL;
-
if (dm_target_name == NULL)
return NULL;
@@ -202,12 +200,11 @@ dm_target_rem(char *dm_target_name)
mutex_exit(&dm_target_mutex);
return EBUSY;
}
- TAILQ_REMOVE(&dm_target_list,
- dmt, dm_target_next);
+ TAILQ_REMOVE(&dm_target_list, dmt, dm_target_next);
mutex_exit(&dm_target_mutex);
- (void) kmem_free(dmt, sizeof(dm_target_t));
+ (void)kmem_free(dmt, sizeof(dm_target_t));
return 0;
}
@@ -224,13 +221,12 @@ dm_target_destroy(void)
mutex_enter(&dm_target_mutex);
while (TAILQ_FIRST(&dm_target_list) != NULL) {
-
dm_target = TAILQ_FIRST(&dm_target_list);
TAILQ_REMOVE(&dm_target_list, TAILQ_FIRST(&dm_target_list),
dm_target_next);
- (void) kmem_free(dm_target, sizeof(dm_target_t));
+ (void)kmem_free(dm_target, sizeof(dm_target_t));
}
mutex_exit(&dm_target_mutex);
@@ -265,7 +261,6 @@ dm_target_prop_list(void)
mutex_enter(&dm_target_mutex);
TAILQ_FOREACH(dm_target, &dm_target_list, dm_target_next) {
-
target_dict = prop_dictionary_create();
ver = prop_array_create();
prop_dictionary_set_cstring(target_dict, DM_TARGETS_NAME,
