summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/syscons/syscons.c4
-rw-r--r--sys/dev/syscons/sysmouse.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c3
-rw-r--r--sys/gnu/ext2fs/ext2_alloc.c4
-rw-r--r--sys/gnu/ext2fs/ext2_vnops.c4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_alloc.c4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vnops.c4
-rw-r--r--sys/ufs/ufs/ufs_vnops.c4
8 files changed, 16 insertions, 15 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 3c7eb23..a4e5d8b 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -475,8 +475,8 @@ scopen(struct cdev *dev, int flag, int mode, struct thread *td)
#endif
int error;
- DPRINTF(5, ("scopen: dev:%d,%d, unit:%d, vty:%d\n",
- major(dev), minor(dev), unit, SC_VTY(dev)));
+ DPRINTF(5, ("scopen: dev:%s, unit:%d, vty:%d\n",
+ devtoname(dev), unit, SC_VTY(dev)));
tp = dev->si_tty;
sc = sc_get_softc(unit, (sc_console_unit == unit) ? SC_KERNEL_CONSOLE : 0);
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 4f660e0..0f6cec5 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -70,8 +70,8 @@ smopen(struct cdev *dev, int flag, int mode, struct thread *td)
{
struct tty *tp;
- DPRINTF(5, ("smopen: dev:%d,%d, vty:%d\n",
- major(dev), minor(dev), SC_VTY(dev)));
+ DPRINTF(5, ("smopen: dev:%s, vty:%d\n",
+ devtoname(dev), SC_VTY(dev)));
#if 0
if (SC_VTY(dev) != SC_MOUSE)
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 636b92a..5c85b92 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -56,6 +56,7 @@
#include <sys/kernel.h>
#include <sys/stat.h>
#include <sys/bio.h>
+#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/mount.h>
@@ -1833,7 +1834,7 @@ msdosfs_print(ap)
printf("\tstartcluster %lu, dircluster %lu, diroffset %lu, ",
dep->de_StartCluster, dep->de_dirclust, dep->de_diroffset);
- printf("on dev (%d, %d)\n", major(dep->de_dev), minor(dep->de_dev));
+ printf("on dev %s\n", devtoname(dep->de_dev));
return (0);
}
diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index 9d387f8..394a252 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -499,8 +499,8 @@ ext2_vfree(pvp, ino, mode)
pip = VTOI(pvp);
fs = pip->i_e2fs;
if ((u_int)ino > fs->s_inodes_per_group * fs->s_groups_count)
- panic("ext2_vfree: range: dev = (%d, %d), ino = %d, fs = %s",
- major(pip->i_dev), minor(pip->i_dev), ino, fs->fs_fsmnt);
+ panic("ext2_vfree: range: dev = %s, ino = %d, fs = %s",
+ devtoname(pip->i_dev), ino, fs->fs_fsmnt);
/* ext2_debug("ext2_vfree (%d, %d) called\n", pip->i_number, mode);
*/
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 0f267b5..681154d 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -1448,8 +1448,8 @@ ext2_print(ap)
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
- printf("\tino %lu, on dev %s (%d, %d)", (u_long)ip->i_number,
- devtoname(ip->i_dev), major(ip->i_dev), minor(ip->i_dev));
+ printf("\tino %lu, on dev %s", (u_long)ip->i_number,
+ devtoname(ip->i_dev));
if (vp->v_type == VFIFO)
fifo_printinfo(vp);
printf("\n");
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 9d387f8..394a252 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -499,8 +499,8 @@ ext2_vfree(pvp, ino, mode)
pip = VTOI(pvp);
fs = pip->i_e2fs;
if ((u_int)ino > fs->s_inodes_per_group * fs->s_groups_count)
- panic("ext2_vfree: range: dev = (%d, %d), ino = %d, fs = %s",
- major(pip->i_dev), minor(pip->i_dev), ino, fs->fs_fsmnt);
+ panic("ext2_vfree: range: dev = %s, ino = %d, fs = %s",
+ devtoname(pip->i_dev), ino, fs->fs_fsmnt);
/* ext2_debug("ext2_vfree (%d, %d) called\n", pip->i_number, mode);
*/
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 0f267b5..681154d 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -1448,8 +1448,8 @@ ext2_print(ap)
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
- printf("\tino %lu, on dev %s (%d, %d)", (u_long)ip->i_number,
- devtoname(ip->i_dev), major(ip->i_dev), minor(ip->i_dev));
+ printf("\tino %lu, on dev %s", (u_long)ip->i_number,
+ devtoname(ip->i_dev));
if (vp->v_type == VFIFO)
fifo_printinfo(vp);
printf("\n");
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 05e9333..2eadb2d 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1964,8 +1964,8 @@ ufs_print(ap)
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
- printf("\tino %lu, on dev %s (%d, %d)", (u_long)ip->i_number,
- devtoname(ip->i_dev), major(ip->i_dev), minor(ip->i_dev));
+ printf("\tino %lu, on dev %s", (u_long)ip->i_number,
+ devtoname(ip->i_dev));
if (vp->v_type == VFIFO)
fifo_printinfo(vp);
printf("\n");
OpenPOWER on IntegriCloud