Module Name: src
Committed By: tkusumi
Date: Sun Dec 15 09:22:29 UTC 2019
Modified Files:
src/sys/dev/dm: device-mapper.c dm.h dm_table.c dm_target_linear.c
dm_target_stripe.c
Log Message:
dm: "unsigned" -> "unsigned int" for consistency
Use either one, but not both.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.36 -r1.37 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/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.51 src/sys/dev/dm/device-mapper.c:1.52
--- src/sys/dev/dm/device-mapper.c:1.51 Sat Dec 14 11:20:51 2019
+++ src/sys/dev/dm/device-mapper.c Sun Dec 15 09:22:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.51 2019/12/14 11:20:51 tkusumi Exp $ */
+/* $NetBSD: device-mapper.c,v 1.52 2019/12/15 09:22:28 tkusumi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -451,7 +451,7 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
case DIOCGWEDGEINFO:
{
struct dkwedge_info *dkw = (void *) data;
- unsigned secsize;
+ unsigned int secsize;
if ((dmv = dm_dev_lookup(NULL, NULL, minor(dev))) == NULL)
return ENODEV;
@@ -703,7 +703,7 @@ void
dmgetproperties(struct disk *disk, dm_table_head_t *head)
{
uint64_t numsec;
- unsigned secsize;
+ unsigned int secsize;
dm_table_disksize(head, &numsec, &secsize);
Index: src/sys/dev/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.42 src/sys/dev/dm/dm.h:1.43
--- src/sys/dev/dm/dm.h:1.42 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm.h Sun Dec 15 09:22:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.42 2019/12/15 05:56:02 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.43 2019/12/15 09:22:28 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@ typedef struct dm_pdev {
struct vnode *pdev_vnode;
uint64_t pdev_numsec;
- unsigned pdev_secsize;
+ unsigned int pdev_secsize;
int ref_cnt; /* reference counter for users ofthis pdev */
SLIST_ENTRY(dm_pdev) next_pdev;
@@ -193,7 +193,7 @@ typedef struct dm_target {
int (*strategy)(dm_table_entry_t *, struct buf *);
int (*sync)(dm_table_entry_t *);
int (*upcall)(dm_table_entry_t *, struct buf *);
- int (*secsize)(dm_table_entry_t *, unsigned *);
+ int (*secsize)(dm_table_entry_t *, unsigned int *);
uint32_t version[3];
uint32_t ref_cnt;
@@ -248,7 +248,7 @@ int dm_target_linear_sync(dm_table_entry
int dm_target_linear_deps(dm_table_entry_t *, prop_array_t);
int dm_target_linear_destroy(dm_table_entry_t *);
int dm_target_linear_upcall(dm_table_entry_t *, struct buf *);
-int dm_target_linear_secsize(dm_table_entry_t *, unsigned *);
+int dm_target_linear_secsize(dm_table_entry_t *, unsigned int *);
/* Generic function used to convert char to string */
uint64_t atoi(const char *);
@@ -261,7 +261,7 @@ int dm_target_stripe_sync(dm_table_entry
int dm_target_stripe_deps(dm_table_entry_t *, prop_array_t);
int dm_target_stripe_destroy(dm_table_entry_t *);
int dm_target_stripe_upcall(dm_table_entry_t *, struct buf *);
-int dm_target_stripe_secsize(dm_table_entry_t *, unsigned *);
+int dm_target_stripe_secsize(dm_table_entry_t *, unsigned int *);
/* dm_table.c */
#define DM_TABLE_ACTIVE 0
@@ -270,7 +270,7 @@ int dm_target_stripe_secsize(dm_table_en
int dm_table_destroy(dm_table_head_t *, uint8_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 *);
+void dm_table_disksize(dm_table_head_t *, uint64_t *, unsigned int *);
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);
@@ -300,7 +300,7 @@ dm_pdev_t* dm_pdev_insert(const char *);
/* XXX dummy */
static __inline int
-dm_target_dummy_secsize(dm_table_entry_t *table_en, unsigned *secsizep)
+dm_target_dummy_secsize(dm_table_entry_t *table_en, unsigned int *secsizep)
{
return 0;
}
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.13 src/sys/dev/dm/dm_table.c:1.14
--- src/sys/dev/dm/dm_table.c:1.13 Sat Dec 14 10:49:30 2019
+++ src/sys/dev/dm/dm_table.c Sun Dec 15 09:22:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.13 2019/12/14 10:49:30 tkusumi Exp $ */
+/* $NetBSD: dm_table.c,v 1.14 2019/12/15 09:22:28 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.13 2019/12/14 10:49:30 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.14 2019/12/15 09:22:28 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -226,12 +226,12 @@ 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 int *secsizep)
{
dm_table_t *tbl;
dm_table_entry_t *table_en;
uint64_t length;
- unsigned secsize, tsecsize;
+ unsigned int secsize, tsecsize;
uint8_t id;
length = 0;
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.29 src/sys/dev/dm/dm_target_linear.c:1.30
--- src/sys/dev/dm/dm_target_linear.c:1.29 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target_linear.c Sun Dec 15 09:22:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.29 2019/12/15 05:56:02 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.30 2019/12/15 09:22:28 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.29 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.30 2019/12/15 09:22:28 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -198,10 +198,10 @@ 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 int *secsizep)
{
dm_target_linear_config_t *tlc;
- unsigned secsize;
+ unsigned int secsize;
secsize = 0;
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.36 src/sys/dev/dm/dm_target_stripe.c:1.37
--- src/sys/dev/dm/dm_target_stripe.c:1.36 Sun Dec 15 05:56:02 2019
+++ src/sys/dev/dm/dm_target_stripe.c Sun Dec 15 09:22:28 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.36 2019/12/15 05:56:02 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.37 2019/12/15 09:22:28 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.36 2019/12/15 05:56:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.37 2019/12/15 09:22:28 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -342,11 +342,11 @@ 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 int *secsizep)
{
dm_target_linear_config_t *tlc;
dm_target_stripe_config_t *tsc;
- unsigned secsize;
+ unsigned int secsize;
secsize = 0;
