diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 1997-06-03 17:22:47 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 1997-06-03 17:22:47 +0000 |
| commit | 7d6b68c4de9cfca092d612c67c9918ae02e824e4 (patch) | |
| tree | 33ea789763d750ccc2e57ea41d82341ff17bb9b3 /sys/nfsclient/nfs_vfsops.c | |
| parent | 46c1f176f11b4b53159dcb0751846578fffb6bfb (diff) | |
Notes
Diffstat (limited to 'sys/nfsclient/nfs_vfsops.c')
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 207b1293c68f..9bcc0f7adafc 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 - * $Id: nfs_vfsops.c,v 1.41 1997/05/11 18:05:38 tegge Exp $ + * $Id: nfs_vfsops.c,v 1.42 1997/05/12 19:02:56 tegge Exp $ */ #include <sys/param.h> @@ -706,6 +706,13 @@ mountnfs(argp, mp, nam, pth, hst, vpp) bcopy(pth, mp->mnt_stat.f_mntonname, MNAMELEN); nmp->nm_nam = nam; + /* + * Silently clear NFSMNT_NOCONN if it's a TCP mount, it makes + * no sense in that context. + */ + if (argp->sotype == SOCK_STREAM) + argp->flags &= ~NFSMNT_NOCONN; + if ((argp->flags & NFSMNT_TIMEO) && argp->timeo > 0) { nmp->nm_timeo = (argp->timeo * NFS_HZ + 5) / 10; if (nmp->nm_timeo < NFS_MINTIMEO) |