diff options
author | dfr <dfr@FreeBSD.org> | 1995-08-24 10:17:39 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 1995-08-24 10:17:39 +0000 |
commit | 8bffcb6d1a3b548b22b61ebb466088117f22dbd4 (patch) | |
tree | d90bc1e43584830baedfd1de74bbb3f81e4cf79d /sys/nfs | |
parent | 21ab8fe695e63021b17631de9b39b8302af39240 (diff) | |
download | FreeBSD-src-8bffcb6d1a3b548b22b61ebb466088117f22dbd4.zip FreeBSD-src-8bffcb6d1a3b548b22b61ebb466088117f22dbd4.tar.gz |
Add support for amd direct maps.
Reviewed by: Thomas Graichen <graichen@sirius.physik.fu-berlin.de>
Diffstat (limited to 'sys/nfs')
-rw-r--r-- | sys/nfs/nfs_bio.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_common.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_vfsops.c | 10 |
4 files changed, 14 insertions, 8 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 8507783..d48a020 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.15 1995/06/27 11:06:34 dfr Exp $ + * $Id: nfs_bio.c,v 1.16 1995/07/07 11:01:30 dfr Exp $ */ #include <sys/param.h> @@ -125,7 +125,7 @@ nfs_bioread(vp, uio, ioflag, cred) * attributes this could be forced by setting n_attrstamp to 0 before * the VOP_GETATTR() call. */ - if ((nmp->nm_flag & NFSMNT_NQNFS) == 0 && vp->v_type != VLNK) { + if ((nmp->nm_flag & NFSMNT_NQNFS) == 0) { if (np->n_flag & NMODIFIED) { if (vp->v_type != VREG) { if (vp->v_type != VDIR) diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 4c6d4bb..5bdda4a 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $ + * $Id: nfs_subs.c,v 1.22 1995/07/29 11:42:22 bde Exp $ */ /* @@ -1243,7 +1243,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) * information. */ np = VTONFS(vp); - if (vp->v_type == VNON) { + if (vp->v_type != vtyp) { /* * If we had a lock and it turns out that the vnode * is an object which we don't want to lock (e.g. VDIR) diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 4c6d4bb..5bdda4a 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $ + * $Id: nfs_subs.c,v 1.22 1995/07/29 11:42:22 bde Exp $ */ /* @@ -1243,7 +1243,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) * information. */ np = VTONFS(vp); - if (vp->v_type == VNON) { + if (vp->v_type != vtyp) { /* * If we had a lock and it turns out that the vnode * is an object which we don't want to lock (e.g. VDIR) diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index cc14093..2f94027 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.17 1995/07/07 11:01:31 dfr Exp $ + * $Id: nfs_vfsops.c,v 1.18 1995/08/11 11:31:12 davidg Exp $ */ #include <sys/param.h> @@ -538,6 +538,7 @@ mountnfs(argp, mp, nam, pth, hst, vpp) register struct nfsmount *nmp; struct nfsnode *np; int error, maxio; + struct vattr attrs; if (mp->mnt_flag & MNT_UPDATE) { nmp = VFSTONFS(mp); @@ -689,6 +690,12 @@ mountnfs(argp, mp, nam, pth, hst, vpp) *vpp = NFSTOV(np); /* + * Get file attributes for the mountpoint. This has the side + * effect of filling in (*vpp)->v_type with the correct value. + */ + VOP_GETATTR(*vpp, &attrs, curproc->p_ucred, curproc); + + /* * Lose the lock but keep the ref. */ VOP_UNLOCK(*vpp); @@ -797,7 +804,6 @@ nfs_root(mp, vpp) return (error); vp = NFSTOV(np); VOP_UNLOCK(vp); - vp->v_type = VDIR; vp->v_flag = VROOT; *vpp = vp; return (0); |