diff options
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_serv.c | 6 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index eef3d7f..7068050 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.75 1999/04/28 11:37:54 phk Exp $ + * $Id: nfs_serv.c,v 1.76 1999/05/06 18:13:04 peter Exp $ */ /* @@ -1453,7 +1453,7 @@ nfsrv_create(nfsd, slp, procp, mrq) nfsm_reply(0); return (error); } else - vap->va_rdev = (dev_t)rdev; + vap->va_rdev = rdev; nqsrv_getl(nd.ni_dvp, ND_WRITE); error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); vput(nd.ni_dvp); @@ -1619,7 +1619,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 = makedev(major, minor); + vap->va_rdev = umakedev(major, minor); } /* diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 03c20ca..9a36211 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.72 1999/01/27 22:42:27 dillon Exp $ + * $Id: nfs_subs.c,v 1.73 1999/02/17 13:59:29 bde 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 = makedev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), + rdev = umakedev(fxdr_unsigned(int, fp->fa3_rdev.specdata1), fxdr_unsigned(int, fp->fa3_rdev.specdata2)); fxdr_nfsv3time(&fp->fa3_mtime, &mtime); } else { @@ -1312,7 +1312,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) } if (vp->v_type == VCHR || vp->v_type == VBLK) { vp->v_op = spec_nfsv2nodeop_p; - nvp = checkalias(vp, (dev_t)rdev, vp->v_mount); + nvp = checkalias(vp, rdev, vp->v_mount); if (nvp) { /* * Discard unneeded vnode, but save its nfsnode. @@ -1338,7 +1338,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) vap = &np->n_vattr; vap->va_type = vtyp; vap->va_mode = (vmode & 07777); - vap->va_rdev = (dev_t)rdev; + vap->va_rdev = rdev; vap->va_mtime = mtime; vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0]; if (v3) { @@ -1862,8 +1862,8 @@ nfsm_srvfattr(nfsd, vap, fp) fp->fa_mode = vtonfsv3_mode(vap->va_mode); txdr_hyper(&vap->va_size, &fp->fa3_size); txdr_hyper(&vap->va_bytes, &fp->fa3_used); - fp->fa3_rdev.specdata1 = txdr_unsigned(major(vap->va_rdev)); - fp->fa3_rdev.specdata2 = txdr_unsigned(minor(vap->va_rdev)); + fp->fa3_rdev.specdata1 = txdr_unsigned(umajor(vap->va_rdev)); + fp->fa3_rdev.specdata2 = txdr_unsigned(uminor(vap->va_rdev)); fp->fa3_fsid.nfsuquad[0] = 0; fp->fa3_fsid.nfsuquad[1] = txdr_unsigned(vap->va_fsid); fp->fa3_fileid.nfsuquad[0] = 0; |
