[src/trunk]: src/sys/dev/dm dm: "unsigned" -> "unsigned int" for consistency

[tkusumi <tkusumi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6529fe9bb11b
branches:  trunk
changeset: 967590:6529fe9bb11b
user:      tkusumi <tkusumi%NetBSD.org@localhost>
date:      Sun Dec 15 09:22:28 2019 +0000

description:
dm: "unsigned" -> "unsigned int" for consistency

Use either one, but not both.

diffstat:

 sys/dev/dm/device-mapper.c    |   6 +++---
 sys/dev/dm/dm.h               |  14 +++++++-------
 sys/dev/dm/dm_table.c         |   8 ++++----
 sys/dev/dm/dm_target_linear.c |   8 ++++----
 sys/dev/dm/dm_target_stripe.c |   8 ++++----
 5 files changed, 22 insertions(+), 22 deletions(-)

diffs (186 lines):

diff -r 0d979c5a72b3 -r 6529fe9bb11b sys/dev/dm/device-mapper.c
--- a/sys/dev/dm/device-mapper.c        Sun Dec 15 06:05:00 2019 +0000
+++ b/sys/dev/dm/device-mapper.c        Sun Dec 15 09:22:28 2019 +0000
@@ -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 @@
        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 @@
 dmgetproperties(struct disk *disk, dm_table_head_t *head)
 {
        uint64_t numsec;
-       unsigned secsize;
+       unsigned int secsize;
 
        dm_table_disksize(head, &numsec, &secsize);
 
diff -r 0d979c5a72b3 -r 6529fe9bb11b sys/dev/dm/dm.h
--- a/sys/dev/dm/dm.h   Sun Dec 15 06:05:00 2019 +0000
+++ b/sys/dev/dm/dm.h   Sun Dec 15 09:22:28 2019 +0000
@@ -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 @@
 
        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 @@
        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_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_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_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 @@
 
 /* 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;
 }
diff -r 0d979c5a72b3 -r 6529fe9bb11b sys/dev/dm/dm_table.c
--- a/sys/dev/dm/dm_table.c     Sun Dec 15 06:05:00 2019 +0000
+++ b/sys/dev/dm/dm_table.c     Sun Dec 15 09:22:28 2019 +0000
@@ -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 @@
  * 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;
diff -r 0d979c5a72b3 -r 6529fe9bb11b sys/dev/dm/dm_target_linear.c
--- a/sys/dev/dm/dm_target_linear.c     Sun Dec 15 06:05:00 2019 +0000
+++ b/sys/dev/dm/dm_target_linear.c     Sun Dec 15 09:22:28 2019 +0000
@@ -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 @@
  * 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;
 
diff -r 0d979c5a72b3 -r 6529fe9bb11b sys/dev/dm/dm_target_stripe.c
--- a/sys/dev/dm/dm_target_stripe.c     Sun Dec 15 06:05:00 2019 +0000
+++ b/sys/dev/dm/dm_target_stripe.c     Sun Dec 15 09:22:28 2019 +0000
@@ -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 @@
  * 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;