diff options
| author | phk <phk@FreeBSD.org> | 2003-03-18 07:52:59 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-03-18 07:52:59 +0000 |
| commit | 6c4e57c44b14dd2458b25ec5c6e8140593e9c65c (patch) | |
| tree | 927b8f9d9d1dd89aeb8e4cebde5c70db737da370 | |
| parent | 675a64d536e2ea0c4c219d61d4faad7c1f9bdc98 (diff) | |
| download | FreeBSD-src-6c4e57c44b14dd2458b25ec5c6e8140593e9c65c.zip FreeBSD-src-6c4e57c44b14dd2458b25ec5c6e8140593e9c65c.tar.gz | |
Make devstat_new_entry() take a const void * rather than const char *
argument, GEOM nodes are not identified by ascii string.
| -rw-r--r-- | sys/kern/subr_devstat.c | 10 | ||||
| -rw-r--r-- | sys/sys/devicestat.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index 4581fe9..6bfc7f4 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -48,7 +48,7 @@ static int devstat_current_devnumber; static struct devstatlist device_statq; static struct devstat *devstat_alloc(void); static void devstat_free(struct devstat *); -static void devstat_add_entry(struct devstat *ds, const char *dev_name, +static void devstat_add_entry(struct devstat *ds, const void *dev_name, int unit_number, u_int32_t block_size, devstat_support_flags flags, devstat_type_flags device_type, @@ -58,7 +58,7 @@ static void devstat_add_entry(struct devstat *ds, const char *dev_name, * Allocate a devstat and initialize it */ struct devstat * -devstat_new_entry(const char *dev_name, +devstat_new_entry(const void *dev_name, int unit_number, u_int32_t block_size, devstat_support_flags flags, devstat_type_flags device_type, @@ -77,7 +77,7 @@ devstat_new_entry(const char *dev_name, * and add it to the queue of devices. */ static void -devstat_add_entry(struct devstat *ds, const char *dev_name, +devstat_add_entry(struct devstat *ds, const void *dev_name, int unit_number, u_int32_t block_size, devstat_support_flags flags, devstat_type_flags device_type, @@ -141,8 +141,8 @@ devstat_add_entry(struct devstat *ds, const char *dev_name, ds, dev_links); printf("devstat_add_entry: HELP! " "sorting problem detected " - "for %s%d\n", dev_name, - unit_number); + "for name %p unit %d\n", + dev_name, unit_number); break; } } diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h index d8288a2..2fb19ec 100644 --- a/sys/sys/devicestat.h +++ b/sys/sys/devicestat.h @@ -180,7 +180,7 @@ STAILQ_HEAD(devstatlist, devstat); #ifdef _KERNEL struct bio; -struct devstat *devstat_new_entry(const char *dev_name, int unit_number, +struct devstat *devstat_new_entry(const void *dev_name, int unit_number, u_int32_t block_size, devstat_support_flags flags, devstat_type_flags device_type, |
