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/kern | |
| 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/kern')
| -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 |
3 files changed, 11 insertions, 11 deletions
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)); } } |
