Remove direct access to si_name.

Code should just use the devtoname() function to obtain the name of a
character device. Also add const keywords to pieces of code that need it
to build properly.

MFC after:	2 weeks

3 files changed, 5 insertions, 5 deletions

diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index bea7747..2e05c85 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -66,7 +66,7 @@ translate_vnhook_major_minor(struct vnode *vp, struct stat *sb)
 	int major, minor;
 
 	if (vp->v_type == VCHR && vp->v_rdev != NULL &&
-	    linux_driver_get_major_minor(vp->v_rdev->si_name,
+	    linux_driver_get_major_minor(devtoname(vp->v_rdev),
 	    &major, &minor) == 0) {
 		sb->st_rdev = (major << 8 | minor);
 	}
@@ -149,14 +149,14 @@ translate_fd_major_minor(struct thread *td, int fd, struct stat *buf)
 		return;
 	vp = fp->f_vnode;
 	if (vp != NULL && vp->v_rdev != NULL &&
-	    linux_driver_get_major_minor(vp->v_rdev->si_name,
+	    linux_driver_get_major_minor(devtoname(vp->v_rdev),
 					 &major, &minor) == 0) {
 		buf->st_rdev = (major << 8 | minor);
 	} else if (fp->f_type == DTYPE_PTS) {
 		struct tty *tp = fp->f_data;
 
 		/* Convert the numbers for the slave device. */
-		if (linux_driver_get_major_minor(tp->t_dev->si_name,
+		if (linux_driver_get_major_minor(devtoname(tp->t_dev),
 					 &major, &minor) == 0) {
 			buf->st_rdev = (major << 8 | minor);
 		}
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 3412c37..3c26f88 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -124,7 +124,7 @@ linux_driver_get_name_dev(device_t dev)
 }
 
 int
-linux_driver_get_major_minor(char *node, int *major, int *minor)
+linux_driver_get_major_minor(const char *node, int *major, int *minor)
 {
 	struct device_element *de;
 
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 13cd359..2908a0f 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -97,7 +97,7 @@ struct linux_device_handler {
 int	linux_device_register_handler(struct linux_device_handler *h);
 int	linux_device_unregister_handler(struct linux_device_handler *h);
 char	*linux_driver_get_name_dev(device_t dev);
-int	linux_driver_get_major_minor(char *node, int *major, int *minor);
+int	linux_driver_get_major_minor(const char *node, int *major, int *minor);
 char	*linux_get_char_devices(void);
 void	linux_free_get_char_devices(char *string);