diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-06-17 17:16:53 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-06-17 17:16:53 +0000 |
| commit | f3732fd15b5a493a090a0453f937a78949c65f7d (patch) | |
| tree | fe8b297144afd6d6f7db41275c72cb5eb663ec02 /sys/isofs/cd9660 | |
| parent | c0d431fe315475c5fe50084db455416148d57914 (diff) | |
| download | src-f3732fd15b5a493a090a0453f937a78949c65f7d.tar.gz src-f3732fd15b5a493a090a0453f937a78949c65f7d.zip | |
Second half of the dev_t cleanup.
The big lines are:
NODEV -> NULL
NOUDEV -> NODEV
udev_t -> dev_t
udev2dev() -> findcdev()
Various minor adjustments including handling of userland access to kernel
space struct cdev etc.
Notes
Notes:
svn path=/head/; revision=130640
Diffstat (limited to 'sys/isofs/cd9660')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_node.h | 2 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_rrip.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h index a5b228c45f06..fb74f3998483 100644 --- a/sys/isofs/cd9660/cd9660_node.h +++ b/sys/isofs/cd9660/cd9660_node.h @@ -52,7 +52,7 @@ typedef struct { uid_t iso_uid; /* owner user id */ gid_t iso_gid; /* owner group id */ short iso_links; /* links of file */ - udev_t iso_rdev; /* Major/Minor number for special */ + dev_t iso_rdev; /* Major/Minor number for special */ } ISO_RRIP_INODE; diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index 48eac6d2a3b1..f20b4db10516 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -413,9 +413,9 @@ cd9660_rrip_device(p,ana) low = isonum_733(p->dev_t_low); if (high == 0) - ana->inop->inode.iso_rdev = makeudev(umajor(low), uminor(low)); + ana->inop->inode.iso_rdev = makedev(umajor(low), uminor(low)); else - ana->inop->inode.iso_rdev = makeudev(high, uminor(low)); + ana->inop->inode.iso_rdev = makedev(high, uminor(low)); ana->fields &= ~ISO_SUSP_DEVICE; return ISO_SUSP_DEVICE; } |