Module Name: src
Committed By: christos
Date: Fri Oct 18 19:56:30 UTC 2013
Modified Files:
src/sys/dev/dm: device-mapper.c dm_ioctl.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/dm/dm_ioctl.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.30 src/sys/dev/dm/device-mapper.c:1.31
--- src/sys/dev/dm/device-mapper.c:1.30 Tue May 28 20:47:48 2013
+++ src/sys/dev/dm/device-mapper.c Fri Oct 18 15:56:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.30 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: device-mapper.c,v 1.31 2013/10/18 19:56:30 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -487,7 +487,6 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
{
dm_table_entry_t *table_en;
dm_table_t *tbl;
- int err;
if ((dmv = dm_dev_lookup(NULL, NULL, minor(dev))) == NULL)
return ENODEV;
@@ -501,7 +500,7 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
*/
SLIST_FOREACH(table_en, tbl, next)
{
- err = table_en->target->sync(table_en);
+ (void)table_en->target->sync(table_en);
}
dm_table_release(&dmv->table_head, DM_TABLE_ACTIVE);
dm_dev_unbusy(dmv);
@@ -529,8 +528,6 @@ dmstrategy(struct buf *bp)
dm_table_entry_t *table_en;
struct buf *nestbuf;
- uint32_t dev_type;
-
uint64_t buf_start, buf_len, issued_len;
uint64_t table_start, table_end;
uint64_t start, end;
@@ -541,7 +538,6 @@ dmstrategy(struct buf *bp)
tbl = NULL;
table_end = 0;
- dev_type = 0;
issued_len = 0;
if ((dmv = dm_dev_lookup(NULL, NULL, minor(bp->b_dev))) == NULL) {
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.26 src/sys/dev/dm/dm_ioctl.c:1.27
--- src/sys/dev/dm/dm_ioctl.c:1.26 Sat Aug 27 13:07:49 2011
+++ src/sys/dev/dm/dm_ioctl.c Fri Oct 18 15:56:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.26 2011/08/27 17:07:49 ahoka Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.27 2013/10/18 19:56:30 christos Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -614,15 +614,12 @@ dm_table_deps_ioctl(prop_dictionary_t dm
uint32_t flags, minor;
int table_type;
- size_t i;
name = NULL;
uuid = NULL;
dmv = NULL;
flags = 0;
- i = 0;
-
prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name);
prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid);
prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags);
@@ -842,7 +839,7 @@ dm_table_status_ioctl(prop_dictionary_t
prop_array_t cmd_array;
prop_dictionary_t target_dict;
- uint32_t rec_size, minor;
+ uint32_t minor;
const char *name, *uuid;
char *params;
@@ -854,7 +851,6 @@ dm_table_status_ioctl(prop_dictionary_t
name = NULL;
params = NULL;
flags = 0;
- rec_size = 0;
prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name);
prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid);
