diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-28 13:44:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-28 13:44:09 +0000 |
| commit | 7c0d720f533eb03027edc2fbf7b19ca0852eec95 (patch) | |
| tree | 35539536f0ec649803e054a0b51575714a767931 /sys/nfs | |
| parent | a6abc90b2dbbd330aa9f2842d95ba08b4b1149f1 (diff) | |
sync
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_bio.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 13 |
3 files changed, 15 insertions, 8 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index a655aa20c18..0b9b597cbdf 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,5 +1,5 @@ -/* $OpenBSD: nfs_bio.c,v 1.6 1996/04/21 22:30:18 deraadt Exp $ */ -/* $NetBSD: nfs_bio.c,v 1.25 1996/02/29 20:26:16 fvdl Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.7 1996/05/28 13:44:07 deraadt Exp $ */ +/* $NetBSD: nfs_bio.c,v 1.25.4.1 1996/05/25 22:40:32 fvdl Exp $ */ /* * Copyright (c) 1989, 1993 @@ -175,7 +175,7 @@ nfs_bioread(vp, uio, ioflag, cred) } } /* - * Don't cache magic amd symlinks. + * Don't cache symlinks. */ if (np->n_flag & NQNFSNONCACHE || ((vp->v_flag & VROOT) && vp->v_type == VLNK)) { diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index a70cb10ba8c..4a55e4de7f7 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,5 +1,5 @@ -/* $OpenBSD: nfs_subs.c,v 1.7 1996/04/21 22:30:30 deraadt Exp $ */ -/* $NetBSD: nfs_subs.c,v 1.27 1996/04/03 23:25:36 thorpej Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.8 1996/05/28 13:44:08 deraadt Exp $ */ +/* $NetBSD: nfs_subs.c,v 1.27.4.1 1996/05/25 22:40:34 fvdl Exp $ */ /* * Copyright (c) 1989, 1993 diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index e88285592e5..9041cb09653 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,5 +1,5 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.9 1996/05/14 22:41:32 deraadt Exp $ */ -/* $NetBSD: nfs_vfsops.c,v 1.46 1996/03/24 23:58:10 fvdl Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.10 1996/05/28 13:44:08 deraadt Exp $ */ +/* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* * Copyright (c) 1989, 1993, 1995 @@ -591,6 +591,12 @@ nfs_mount(mp, path, data, ndp, p) if (nmp == NULL) return (EIO); + /* + * When doing an update, we can't change from or to + * v3 and/or nqnfs. + */ + args.flags = (args.flags & ~(NFSMNT_NFSV3|NFSMNT_NQNFS)) | + (nmp->nm_flag & (NFSMNT_NFSV3|NFSMNT_NQNFS)); nfs_decode_args(nmp, &args); return (0); } @@ -711,7 +717,7 @@ mountnfs(argp, mp, nam, pth, hst, vpp) if (error) goto bad; *vpp = NFSTOV(np); - VOP_GETATTR(*vpp, &attrs, curproc->p_ucred, curproc); + VOP_GETATTR(*vpp, &attrs, curproc->p_ucred, curproc); /* XXX */ return (0); bad: @@ -807,6 +813,7 @@ nfs_root(mp, vpp) struct nfsmount *nmp; struct nfsnode *np; int error; + struct vattr attrs; nmp = VFSTONFS(mp); error = nfs_nget(mp, (nfsfh_t *)nmp->nm_fh, nmp->nm_fhsize, &np); |