CVS commit: src/sys/dev/dm

[Tomohiro Kusumi]

Module Name:    src
Committed By:   tkusumi
Date:           Thu Dec 19 15:34:54 UTC 2019

Modified Files:
        src/sys/dev/dm: device-mapper.c dm_target.c

Log Message:
dm: u_{int,long} -> unsigned {int,long}


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.33 -r1.34 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.55 src/sys/dev/dm/device-mapper.c:1.56
--- src/sys/dev/dm/device-mapper.c:1.55	Sun Dec 15 16:14:27 2019
+++ src/sys/dev/dm/device-mapper.c	Thu Dec 19 15:34:54 2019
@@ -1,4 +1,4 @@
-/*        $NetBSD: device-mapper.c,v 1.55 2019/12/15 16:14:27 tkusumi Exp $ */
+/*        $NetBSD: device-mapper.c,v 1.56 2019/12/19 15:34:54 tkusumi Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,8 +66,8 @@ static int dmdestroy(void);
 static void dm_doinit(void);
 
 static int dm_cmd_to_fun(prop_dictionary_t);
-static int disk_ioctl_switch(dev_t, u_long, void *);
-static int dm_ioctl_switch(u_long);
+static int disk_ioctl_switch(dev_t, unsigned long, void *);
+static int dm_ioctl_switch(unsigned long);
 static void dmminphys(struct buf *);
 
 /* CF attach/detach functions used for power management */
@@ -413,7 +413,7 @@ dm_cmd_to_fun(prop_dictionary_t dm_dict)
 
 /* Call apropriate ioctl handler function. */
 static int
-dm_ioctl_switch(u_long cmd)
+dm_ioctl_switch(unsigned long cmd)
 {
 
 	switch(cmd) {
@@ -433,7 +433,7 @@ dm_ioctl_switch(u_long cmd)
  * Check for disk specific ioctls.
  */
 static int
-disk_ioctl_switch(dev_t dev, u_long cmd, void *data)
+disk_ioctl_switch(dev_t dev, unsigned long cmd, void *data)
 {
 	dm_dev_t *dmv;
 
@@ -504,9 +504,8 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
 	}
 	case DIOCGSECTORSIZE:
 	{
-		u_int *valp = data;
 		uint64_t numsec;
-		unsigned int secsize;
+		unsigned int secsize, *valp = data;
 
 		if ((dmv = dm_dev_lookup(NULL, NULL, minor(dev))) == NULL)
 			return ENODEV;

Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.33 src/sys/dev/dm/dm_target.c:1.34
--- src/sys/dev/dm/dm_target.c:1.33	Mon Dec 16 14:26:23 2019
+++ src/sys/dev/dm/dm_target.c	Thu Dec 19 15:34:54 2019
@@ -1,4 +1,4 @@
-/*        $NetBSD: dm_target.c,v 1.33 2019/12/16 14:26:23 tkusumi Exp $      */
+/*        $NetBSD: dm_target.c,v 1.34 2019/12/19 15:34:54 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.33 2019/12/16 14:26:23 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.34 2019/12/19 15:34:54 tkusumi Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +77,7 @@ dm_target_t *
 dm_target_autoload(const char *dm_target_name)
 {
 	char name[30];
-	u_int gen;
+	unsigned int gen;
 	dm_target_t *dmt;
 
 	snprintf(name, sizeof(name), "dm_target_%s", dm_target_name);