diff options
author | phk <phk@FreeBSD.org> | 1999-07-17 18:43:50 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-07-17 18:43:50 +0000 |
commit | 6c373ff516a4d81fb7ff42fa2e5f83336c689d02 (patch) | |
tree | f55a7b55757713b880028c26ee5d442c89c0bfee /sys | |
parent | 490319991d4e8db85c4f009d40158c8aeeaf2ed8 (diff) | |
download | FreeBSD-src-6c373ff516a4d81fb7ff42fa2e5f83336c689d02.zip FreeBSD-src-6c373ff516a4d81fb7ff42fa2e5f83336c689d02.tar.gz |
I have not one single time remembered the name of this function correctly
so obviously I gave it the wrong name. s/umakedev/makeudev/g
Diffstat (limited to 'sys')
-rw-r--r-- | sys/fs/cd9660/cd9660_rrip.c | 6 | ||||
-rw-r--r-- | sys/isofs/cd9660/cd9660_rrip.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_conf.c | 6 | ||||
-rw-r--r-- | sys/kern/vfs_export.c | 8 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 8 | ||||
-rw-r--r-- | sys/nfs/nfs_common.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_serv.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/nfsclient/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/nfsserver/nfs_serv.c | 4 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 4 | ||||
-rw-r--r-- | sys/sys/systm.h | 4 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/vm/vm_swap.c | 4 |
14 files changed, 35 insertions, 35 deletions
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 941435c..c4ad1d7 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 - * $Id: cd9660_rrip.c,v 1.14 1999/04/18 10:58:01 dcs Exp $ + * $Id: cd9660_rrip.c,v 1.15 1999/05/11 19:54:24 phk Exp $ */ #include <sys/param.h> @@ -423,9 +423,9 @@ cd9660_rrip_device(p,ana) low = isonum_733(p->dev_t_low); if (high == 0) - ana->inop->inode.iso_rdev = umakedev(umajor(low), uminor(low)); + ana->inop->inode.iso_rdev = makeudev(umajor(low), uminor(low)); else - ana->inop->inode.iso_rdev = umakedev(high, uminor(low)); + ana->inop->inode.iso_rdev = makeudev(high, uminor(low)); ana->fields &= ~ISO_SUSP_DEVICE; return ISO_SUSP_DEVICE; } diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index 941435c..c4ad1d7 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 - * $Id: cd9660_rrip.c,v 1.14 1999/04/18 10:58:01 dcs Exp $ + * $Id: cd9660_rrip.c,v 1.15 1999/05/11 19:54:24 phk Exp $ */ #include <sys/param.h> @@ -423,9 +423,9 @@ cd9660_rrip_device(p,ana) low = isonum_733(p->dev_t_low); if (high == 0) - ana->inop->inode.iso_rdev = umakedev(umajor(low), uminor(low)); + ana->inop->inode.iso_rdev = makeudev(umajor(low), uminor(low)); else - ana->inop->inode.iso_rdev = umakedev(high, uminor(low)); + ana->inop->inode.iso_rdev = makeudev(high, uminor(low)); ana->fields &= ~ISO_SUSP_DEVICE; return ISO_SUSP_DEVICE; } diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index a263621..1123404 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_conf.c,v 1.46 1999/07/03 08:22:30 phk Exp $ + * $Id: kern_conf.c,v 1.47 1999/07/04 14:58:38 phk Exp $ */ #include <sys/param.h> @@ -225,7 +225,7 @@ makedev(int x, int y) udev_t dev2udev(dev_t x) { - return umakedev(major(x), minor(x)); + return makeudev(major(x), minor(x)); } dev_t @@ -247,7 +247,7 @@ umajor(udev_t dev) } udev_t -umakedev(int x, int y) +makeudev(int x, int y) { return ((x << 8) | y); } diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 9d2e025..adfefd7 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.207 1999/07/08 06:05:55 mckusick Exp $ + * $Id: vfs_subr.c,v 1.208 1999/07/12 15:02:50 kris Exp $ */ /* @@ -344,16 +344,16 @@ vfs_getnewfsid(mp) simple_lock(&mntid_slock); mtype = mp->mnt_vfc->vfc_typenum; - mp->mnt_stat.f_fsid.val[0] = umakedev(255, mtype); + mp->mnt_stat.f_fsid.val[0] = makeudev(255, mtype); mp->mnt_stat.f_fsid.val[1] = mtype; if (xxxfs_mntid == 0) ++xxxfs_mntid; - tfsid.val[0] = umakedev(255, mtype + (xxxfs_mntid << 16)); + tfsid.val[0] = makeudev(255, mtype + (xxxfs_mntid << 16)); tfsid.val[1] = mtype; if (mountlist.cqh_first != (void *)&mountlist) { while (vfs_getvfs(&tfsid)) { xxxfs_mntid++; - tfsid.val[0] = umakedev(255, + tfsid.val[0] = makeudev(255, mtype + (xxxfs_mntid << 16)); } } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9d2e025..adfefd7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.207 1999/07/08 06:05:55 mckusick Exp $ + * $Id: vfs_subr.c,v 1.208 1999/07/12 15:02:50 kris Exp $ */ /* @@ -344,16 +344,16 @@ vfs_getnewfsid(mp) simple_lock(&mntid_slock); mtype = mp->mnt_vfc->vfc_typenum; - mp->mnt_stat.f_fsid.val[0] = umakedev(255, mtype); + mp->mnt_stat.f_fsid.val[0] = makeudev(255, mtype); mp->mnt_stat.f_fsid.val[1] = mtype; if (xxxfs_mntid == 0) ++xxxfs_mntid; - tfsid.val[0] = umakedev(255, mtype + (xxxfs_mntid << 16)); + tfsid.val[0] = makeudev(255, mtype + (xxxfs_mntid << 16)); tfsid.val[1] = mtype; if (mountlist.cqh_first != (void *)&mountlist) { while (vfs_getvfs(&tfsid)) { xxxfs_mntid++; - tfsid.val[0] = umakedev(255, + tfsid.val[0] = makeudev(255, mtype + (xxxfs_mntid << 16)); } } diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index d2d4365..68a936a 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $ + * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $ */ /* @@ -1260,7 +1260,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) if (v3) { vtyp = nfsv3tov_type(fp->fa_type); vmode = fxdr_unsigned(u_short, fp->fa_mode); - rdev = umakedev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), + rdev = makeudev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), fxdr_unsigned(int, fp->fa3_rdev.specdata2)); fxdr_nfsv3time(&fp->fa3_mtime, &mtime); } else { diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index a32c09a..68cc700 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95 - * $Id: nfs_serv.c,v 1.79 1999/06/23 04:44:11 julian Exp $ + * $Id: nfs_serv.c,v 1.80 1999/06/30 04:29:13 julian Exp $ */ /* @@ -1875,7 +1875,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq) nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED); major = fxdr_unsigned(u_int32_t, *tl++); minor = fxdr_unsigned(u_int32_t, *tl); - vap->va_rdev = umakedev(major, minor); + vap->va_rdev = makeudev(major, minor); } /* diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index d2d4365..68a936a 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $ + * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $ */ /* @@ -1260,7 +1260,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) if (v3) { vtyp = nfsv3tov_type(fp->fa_type); vmode = fxdr_unsigned(u_short, fp->fa_mode); - rdev = umakedev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), + rdev = makeudev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), fxdr_unsigned(int, fp->fa3_rdev.specdata2)); fxdr_nfsv3time(&fp->fa3_mtime, &mtime); } else { diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index d2d4365..68a936a 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $ + * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $ */ /* @@ -1260,7 +1260,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) if (v3) { vtyp = nfsv3tov_type(fp->fa_type); vmode = fxdr_unsigned(u_short, fp->fa_mode); - rdev = umakedev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), + rdev = makeudev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), fxdr_unsigned(int, fp->fa3_rdev.specdata2)); fxdr_nfsv3time(&fp->fa3_mtime, &mtime); } else { diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index a32c09a..68cc700 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95 - * $Id: nfs_serv.c,v 1.79 1999/06/23 04:44:11 julian Exp $ + * $Id: nfs_serv.c,v 1.80 1999/06/30 04:29:13 julian Exp $ */ /* @@ -1875,7 +1875,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq) nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED); major = fxdr_unsigned(u_int32_t, *tl++); minor = fxdr_unsigned(u_int32_t, *tl); - vap->va_rdev = umakedev(major, minor); + vap->va_rdev = makeudev(major, minor); } /* diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index d2d4365..68a936a 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 - * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $ + * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $ */ /* @@ -1260,7 +1260,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) if (v3) { vtyp = nfsv3tov_type(fp->fa_type); vmode = fxdr_unsigned(u_short, fp->fa_mode); - rdev = umakedev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), + rdev = makeudev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), fxdr_unsigned(int, fp->fa3_rdev.specdata2)); fxdr_nfsv3time(&fp->fa3_mtime, &mtime); } else { diff --git a/sys/sys/systm.h b/sys/sys/systm.h index d15f892..401f6e1 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $Id: systm.h,v 1.89 1999/05/11 19:54:59 phk Exp $ + * $Id: systm.h,v 1.90 1999/05/31 20:42:41 dt Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -314,5 +314,5 @@ udev_t dev2udev(dev_t x); dev_t udev2dev(udev_t x, int b); int uminor(udev_t dev); int umajor(udev_t dev); -udev_t umakedev(int x, int y); +udev_t makeudev(int x, int y); #endif /* !_SYS_SYSTM_H_ */ diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index c9e2ae8..47e4676 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 - * $Id: mfs_vfsops.c,v 1.62 1999/05/11 19:55:03 phk Exp $ + * $Id: mfs_vfsops.c,v 1.64 1999/05/24 00:27:12 jb Exp $ */ @@ -308,7 +308,7 @@ mfs_mount(mp, path, data, ndp, p) goto error_1; } devvp->v_type = VBLK; - if (checkalias(devvp, umakedev(255, mfs_minor++), (struct mount *)0)) + if (checkalias(devvp, makeudev(255, mfs_minor++), (struct mount *)0)) panic("mfs_mount: dup dev"); devvp->v_data = mfsp; mfsp->mfs_baseoff = args.base; diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 89d2a5b..b9a286f 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.75 1999/07/07 04:07:03 msmith Exp $ + * $Id: vm_swap.c,v 1.76 1999/07/07 09:12:44 ache Exp $ */ #include "opt_devfs.h" @@ -348,7 +348,7 @@ swaponvp(p, vp, dev, nblks) panic("Cannot get vnode for swapdev"); vp1 = nvp; vp1->v_type = VBLK; - if ((nvp = checkalias(vp1, umakedev(BDEV_MAJOR, 0), + if ((nvp = checkalias(vp1, makeudev(BDEV_MAJOR, 0), (struct mount *) 0))) { vput(vp1); vp1 = nvp; |