Module Name: src
Committed By: haad
Date: Mon Jan 4 00:14:41 UTC 2010
Modified Files:
src/sys/dev/dm: dm_target.c dm_target_linear.c dm_target_stripe.c
Log Message:
Indent files remove unnecessary blank lines, white spaces and KNFize code.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/dm/dm_target.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/dm/dm_target_linear.c \
src/sys/dev/dm/dm_target_stripe.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_target.c
diff -u src/sys/dev/dm/dm_target.c:1.11 src/sys/dev/dm/dm_target.c:1.12
--- src/sys/dev/dm/dm_target.c:1.11 Wed Sep 9 22:38:49 2009
+++ src/sys/dev/dm/dm_target.c Mon Jan 4 00:14:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.11 2009/09/09 22:38:49 haad Exp $ */
+/* $NetBSD: dm_target.c,v 1.12 2010/01/04 00:14:41 haad Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include "netbsd-dm.h"
#include "dm.h"
-static dm_target_t* dm_target_lookup_name(const char *);
+static dm_target_t *dm_target_lookup_name(const char *);
TAILQ_HEAD(dm_target_head, dm_target);
@@ -52,21 +52,19 @@
* 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);
}
-
/*
* 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);
}
-
/*
* Try to autoload target module if it was not found in current
* target list.
@@ -79,26 +77,25 @@
dm_target_t *dmt;
snprintf(name, sizeof(name), "dm_target_%s", dm_target_name);
- name[29]='\0';
-
+ name[29] = '\0';
+
do {
gen = module_gen;
-
+
/* Try to autoload target module */
mutex_enter(&module_lock);
(void) module_autoload(name, MODULE_CLASS_MISC);
mutex_exit(&module_lock);
- } while (gen != module_gen);
+ } while (gen != module_gen);
mutex_enter(&dm_target_mutex);
dmt = dm_target_lookup_name(dm_target_name);
if (dmt != NULL)
dm_target_busy(dmt);
mutex_exit(&dm_target_mutex);
-
+
return dmt;
}
-
/*
* Lookup for target in global target list.
*/
@@ -117,20 +114,20 @@
dmt = dm_target_lookup_name(dm_target_name);
if (dmt != NULL)
dm_target_busy(dmt);
-
+
mutex_exit(&dm_target_mutex);
-
- return dmt;
+
+ return dmt;
}
-
/*
* Search for name in TAIL and return apropriate pointer.
*/
-static dm_target_t*
+static dm_target_t *
dm_target_lookup_name(const char *dm_target_name)
{
dm_target_t *dm_target;
- int dlen; int slen;
+ int dlen;
+ int slen;
slen = strlen(dm_target_name) + 1;
@@ -138,24 +135,23 @@
dlen = strlen(dm_target->name) + 1;
if (dlen != slen)
continue;
-
+
if (strncmp(dm_target_name, dm_target->name, slen) == 0)
return dm_target;
}
return NULL;
}
-
/*
* Insert new target struct into the TAIL.
* dm_target
* 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;
-
+
mutex_enter(&dm_target_mutex);
dmt = dm_target_lookup_name(dm_target->name);
@@ -163,11 +159,10 @@
mutex_exit(&dm_target_mutex);
return EEXIST;
}
-
TAILQ_INSERT_TAIL(&dm_target_list, dm_target, dm_target_next);
mutex_exit(&dm_target_mutex);
-
+
return 0;
}
@@ -179,32 +174,29 @@
dm_target_rem(char *dm_target_name)
{
dm_target_t *dmt;
-
+
KASSERT(dm_target_name != NULL);
mutex_enter(&dm_target_mutex);
-
+
dmt = dm_target_lookup_name(dm_target_name);
if (dmt == NULL) {
mutex_exit(&dm_target_mutex);
return ENOENT;
}
-
if (dmt->ref_cnt > 0) {
mutex_exit(&dm_target_mutex);
return EBUSY;
}
-
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;
}
-
/*
* Destroy all targets and remove them from queue.
* This routine is called from dm_detach, before module
@@ -216,38 +208,36 @@
dm_target_t *dm_target;
mutex_enter(&dm_target_mutex);
- while (TAILQ_FIRST(&dm_target_list) != NULL){
+ 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));
+ dm_target_next);
+
+ (void) kmem_free(dm_target, sizeof(dm_target_t));
}
mutex_exit(&dm_target_mutex);
-
+
mutex_destroy(&dm_target_mutex);
-
+
return 0;
}
-
/*
* Allocate new target entry.
*/
-dm_target_t*
+dm_target_t *
dm_target_alloc(const char *name)
{
return kmem_zalloc(sizeof(dm_target_t), KM_SLEEP);
}
-
/*
* Return prop_array of dm_target dictionaries.
*/
prop_array_t
dm_target_prop_list(void)
{
- prop_array_t target_array,ver;
+ prop_array_t target_array, ver;
prop_dictionary_t target_dict;
dm_target_t *dm_target;
@@ -256,10 +246,10 @@
target_array = prop_array_create();
mutex_enter(&dm_target_mutex);
-
- TAILQ_FOREACH (dm_target, &dm_target_list, dm_target_next){
- target_dict = prop_dictionary_create();
+ 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,
dm_target->name);
@@ -275,24 +265,23 @@
}
mutex_exit(&dm_target_mutex);
-
+
return target_array;
}
-
/* Initialize dm_target subsystem. */
int
dm_target_init(void)
{
- dm_target_t *dmt,*dmt3;
+ dm_target_t *dmt, *dmt3;
int r;
r = 0;
mutex_init(&dm_target_mutex, MUTEX_DEFAULT, IPL_NONE);
-
+
dmt = dm_target_alloc("linear");
dmt3 = dm_target_alloc("striped");
-
+
dmt->version[0] = 1;
dmt->version[1] = 0;
dmt->version[2] = 2;
@@ -303,9 +292,9 @@
dmt->deps = &dm_target_linear_deps;
dmt->destroy = &dm_target_linear_destroy;
dmt->upcall = &dm_target_linear_upcall;
-
+
r = dm_target_insert(dmt);
-
+
dmt3->version[0] = 1;
dmt3->version[1] = 0;
dmt3->version[2] = 3;
@@ -316,10 +305,10 @@
dmt3->deps = &dm_target_stripe_deps;
dmt3->destroy = &dm_target_stripe_destroy;
dmt3->upcall = &dm_target_stripe_upcall;
-
+
r = dm_target_insert(dmt3);
-#ifdef notyet
+#ifdef notyet
dmt5->version[0] = 1;
dmt5->version[1] = 0;
dmt5->version[2] = 5;
@@ -330,9 +319,9 @@
dmt5->deps = &dm_target_snapshot_deps;
dmt5->destroy = &dm_target_snapshot_destroy;
dmt5->upcall = &dm_target_snapshot_upcall;
-
+
r = dm_target_insert(dmt5);
-
+
dmt6->version[0] = 1;
dmt6->version[1] = 0;
dmt6->version[2] = 5;
@@ -346,6 +335,6 @@
r = dm_target_insert(dmt6);
#endif
-
+
return r;
}
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.8 src/sys/dev/dm/dm_target_linear.c:1.9
--- src/sys/dev/dm/dm_target_linear.c:1.8 Tue Dec 1 23:12:10 2009
+++ src/sys/dev/dm/dm_target_linear.c Mon Jan 4 00:14:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.8 2009/12/01 23:12:10 haad Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.9 2010/01/04 00:14:41 haad Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -48,56 +48,55 @@
/*
* Allocate target specific config data, and link them to table.
* This function is called only when, flags is not READONLY and
- * therefore we can add things to pdev list. This should not a
+ * therefore we can add things to pdev list. This should not a
* problem because this routine is called only from dm_table_load_ioctl.
* @argv[0] is name,
* @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;
char **ap, *argv[3];
- if(params == NULL)
+ if (params == NULL)
return EINVAL;
-
+
/*
* Parse a string, containing tokens delimited by white space,
* into an argument vector
*/
for (ap = argv; ap < &argv[2] &&
- (*ap = strsep(¶ms, " \t")) != NULL;) {
+ (*ap = strsep(¶ms, " \t")) != NULL;) {
if (**ap != '\0')
ap++;
}
aprint_debug("Linear target init function called %s--%s!!\n",
argv[0], argv[1]);
-
+
/* Insert dmp to global pdev list */
if ((dmp = dm_pdev_insert(argv[0])) == NULL)
return ENOENT;
-
+
if ((tlc = kmem_alloc(sizeof(dm_target_linear_config_t), KM_SLEEP))
== NULL)
return ENOMEM;
tlc->pdev = dmp;
- tlc->offset = 0; /* default settings */
-
+ tlc->offset = 0; /* default settings */
+
/* Check user input if it is not leave offset as 0. */
tlc->offset = atoi(argv[1]);
- *target_config = tlc;
+ *target_config = tlc;
dmv->dev_type = DM_LINEAR_DEV;
-
+
return 0;
}
-
/*
* Status routine is called to get params string, which is target
* specific. When dm_table_status_ioctl is called with flag
@@ -115,39 +114,37 @@
if ((params = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_NOSLEEP)) == NULL)
return NULL;
- aprint_normal("%s %"PRIu64, tlc->pdev->name, tlc->offset);
- snprintf(params, DM_MAX_PARAMS_SIZE,"%s %"PRIu64,
+ aprint_normal("%s %" PRIu64, tlc->pdev->name, tlc->offset);
+ snprintf(params, DM_MAX_PARAMS_SIZE, "%s %" PRIu64,
tlc->pdev->name, tlc->offset);
return params;
}
-
/*
* 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;
tlc = table_en->target_config;
-
+
/* printf("Linear target read function called %" PRIu64 "!!\n",
tlc->offset);*/
bp->b_blkno += tlc->offset;
-
+
VOP_STRATEGY(tlc->pdev->pdev_vnode, bp);
-
+
return 0;
}
-
/*
* 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)
{
dm_target_linear_config_t *tlc;
@@ -155,58 +152,55 @@
* Destroy function is called for every target even if it
* doesn't have target_config.
*/
-
+
if (table_en->target_config == NULL)
return 0;
-
+
tlc = table_en->target_config;
-
+
/* Decrement pdev ref counter if 0 remove it */
dm_pdev_decr(tlc->pdev);
-
+
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
-
+
kmem_free(table_en->target_config, sizeof(dm_target_linear_config_t));
table_en->target_config = NULL;
-
+
return 0;
}
-
/* Add this target pdev dependiences 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;
struct vattr va;
-
+
int error;
-
+
if (table_en->target_config == NULL)
return ENOENT;
-
+
tlc = table_en->target_config;
-
+
if ((error = VOP_GETATTR(tlc->pdev->pdev_vnode, &va, curlwp->l_cred)) != 0)
return error;
-
- prop_array_add_uint64(prop_array, (uint64_t)va.va_rdev);
-
+
+ prop_array_add_uint64(prop_array, (uint64_t) va.va_rdev);
+
return 0;
}
-
/*
* Register upcall device.
* Linear target doesn't need any upcall devices but other targets like
* 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;
}
-
/*
* Transform char s to uint64_t offset number.
*/
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.8 src/sys/dev/dm/dm_target_stripe.c:1.9
--- src/sys/dev/dm/dm_target_stripe.c:1.8 Tue Dec 1 23:12:10 2009
+++ src/sys/dev/dm/dm_target_stripe.c Mon Jan 4 00:14:41 2010
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.8 2009/12/01 23:12:10 haad Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.9 2010/01/04 00:14:41 haad Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -60,16 +60,15 @@
dm_target_t *dmt;
int r;
dmt = NULL;
-
+
switch (cmd) {
case MODULE_CMD_INIT:
if ((dmt = dm_target_lookup("stripe")) != NULL) {
dm_target_unbusy(dmt);
return EEXIST;
}
-
dmt = dm_target_alloc("stripe");
-
+
dmt->version[0] = 1;
dmt->version[1] = 0;
dmt->version[2] = 0;
@@ -82,7 +81,7 @@
dmt->upcall = &dm_target_stripe_upcall;
r = dm_target_insert(dmt);
-
+
break;
case MODULE_CMD_FINI:
@@ -98,7 +97,6 @@
return r;
}
-
#endif
/*
@@ -108,27 +106,27 @@
* 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_stripe_config_t *tsc;
size_t len;
char **ap, *argv[10];
- if(params == NULL)
+ if (params == NULL)
return EINVAL;
len = strlen(params) + 1;
-
+
/*
* Parse a string, containing tokens delimited by white space,
* into an argument vector
*/
for (ap = argv; ap < &argv[9] &&
- (*ap = strsep(¶ms, " \t")) != NULL;) {
+ (*ap = strsep(¶ms, " \t")) != NULL;) {
if (**ap != '\0')
ap++;
}
-
+
printf("Stripe target init function called!!\n");
printf("Stripe target chunk size %s number of stripes %s\n", argv[1], argv[0]);
@@ -141,7 +139,7 @@
if ((tsc = kmem_alloc(sizeof(dm_target_stripe_config_t), KM_NOSLEEP))
== NULL)
return ENOMEM;
-
+
/* Insert dmp to global pdev list */
if ((tsc->stripe_devs[0].pdev = dm_pdev_insert(argv[2])) == NULL)
return ENOENT;
@@ -156,15 +154,14 @@
/* Save length of param string */
tsc->params_len = len;
tsc->stripe_chunksize = atoi(argv[1]);
- tsc->stripe_num = (uint8_t)atoi(argv[0]);
-
+ tsc->stripe_num = (uint8_t) atoi(argv[0]);
+
*target_config = tsc;
dmv->dev_type = DM_STRIPE_DEV;
-
+
return 0;
}
-
/* Status routine called to get params string. */
char *
dm_target_stripe_status(void *target_config)
@@ -173,21 +170,20 @@
char *params;
tsc = target_config;
-
+
if ((params = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
return NULL;
- snprintf(params, DM_MAX_PARAMS_SIZE, "%d %"PRIu64" %s %"PRIu64" %s %"PRIu64,
+ snprintf(params, DM_MAX_PARAMS_SIZE, "%d %" PRIu64 " %s %" PRIu64 " %s %" PRIu64,
tsc->stripe_num, tsc->stripe_chunksize,
tsc->stripe_devs[0].pdev->name, tsc->stripe_devs[0].offset,
tsc->stripe_devs[1].pdev->name, tsc->stripe_devs[1].offset);
-
- return params;
-}
+ return params;
+}
/* 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_stripe_config_t *tsc;
struct buf *nestbuf;
@@ -206,12 +202,12 @@
/* calculate extent of request */
KASSERT(bp->b_resid % DEV_BSIZE == 0);
- blkno = bp->b_blkno;
+ blkno = bp->b_blkno;
blkoff = 0;
num_blks = bp->b_resid / DEV_BSIZE;
for (;;) {
/* blockno to strip piece nr */
- stripe = blkno / tsc->stripe_chunksize;
+ stripe = blkno / tsc->stripe_chunksize;
stripe_off = blkno % tsc->stripe_chunksize;
/* where we are inside the strip */
@@ -231,8 +227,8 @@
VOP_STRATEGY(tsc->stripe_devs[stripe_devnr].pdev->pdev_vnode, nestbuf);
- blkno += issue_blks;
- blkoff += issue_blks * DEV_BSIZE;
+ blkno += issue_blks;
+ blkoff += issue_blks * DEV_BSIZE;
num_blks -= issue_blks;
if (num_blks <= 0)
@@ -241,61 +237,58 @@
return 0;
}
-
/* Doesn't do anything here. */
int
-dm_target_stripe_destroy(dm_table_entry_t *table_en)
+dm_target_stripe_destroy(dm_table_entry_t * table_en)
{
dm_target_stripe_config_t *tsc;
-
+
tsc = table_en->target_config;
if (tsc == NULL)
return 0;
-
+
dm_pdev_decr(tsc->stripe_devs[0].pdev);
dm_pdev_decr(tsc->stripe_devs[1].pdev);
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en->target);
-
+
kmem_free(tsc, sizeof(dm_target_stripe_config_t));
-
+
table_en->target_config = NULL;
return 0;
}
-
/* 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;
struct vattr va;
-
+
int error;
-
+
if (table_en->target_config == NULL)
return ENOENT;
-
+
tsc = table_en->target_config;
-
+
if ((error = VOP_GETATTR(tsc->stripe_devs[0].pdev->pdev_vnode, &va, curlwp->l_cred)) != 0)
return error;
- prop_array_add_uint64(prop_array, (uint64_t)va.va_rdev);
-
+ prop_array_add_uint64(prop_array, (uint64_t) va.va_rdev);
+
if ((error = VOP_GETATTR(tsc->stripe_devs[1].pdev->pdev_vnode, &va, curlwp->l_cred)) != 0)
return error;
-
- prop_array_add_uint64(prop_array, (uint64_t)va.va_rdev);
-
+
+ prop_array_add_uint64(prop_array, (uint64_t) va.va_rdev);
+
return 0;
}
-
/* 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;
}
