Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove nqnfs support.

Browse Source 
namely,
	- make -q a synonym of -3.
	- ignore -L and -D.
This commit is contained in:
yamt 2006-11-09 10:07:00 +00:00
parent c59a65e2fe
commit 442aa98fcd
2 changed files with 21 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sbin/mount_nfs/mount_nfs.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: mount_nfs.8,v 1.30 2006/03/23 23:23:27 wiz Exp $
.\" $NetBSD: mount_nfs.8,v 1.31 2006/11/09 10:07:00 yamt Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994, 1995
.\" The Regents of the University of California. All rights reserved.
@ -29,7 +29,7 @@
.\"
.\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
.\"
.Dd March 24, 2006
.Dd November 9, 2006
.Dt MOUNT_NFS 8
.Os
.Sh NAME
@ -106,20 +106,10 @@ Version 3 protocol.
The default is to try version 3 first, and
fall back to version 2 if the mount fails.
.It Fl D
Used with
Ignored.
It used to be
.Tn NQNFS
to set the
.Dq "dead server threshold"
to the specified number of round trip timeout intervals.
After a
.Dq "dead server threshold"
of retransmit timeouts,
cached data for the unresponsive server is assumed to still be valid.
Values may be set in the range of 1 - 9, with 9 referring to an
.Dq "infinite dead threshold"
(i.e. never assume cached data still valid).
This option is not generally recommended and is really an experimental
feature.
.Dq "dead server threshold" .
.It Fl I
Set the readdir read size to the specified value.
The value should normally
@ -127,11 +117,10 @@ be a multiple of
.Dv DIRBLKSIZ
that is \*[Le] the read size for the mount.
.It Fl L
Used with
Ignored.
It used to be
.Tn NQNFS
to set the lease term to the specified number of seconds.
Only use this argument for mounts with a large round trip delay.
Values are normally in the 10-30 second range.
lease term.
.It Fl P
Use a reserved socket port number.
This is the default, and available
@ -224,8 +213,6 @@ when a
termination signal is posted for the process.
.It Fl l
Used with
.Tn NQNFS
and
.Tn NFS
Version 3 to specify that the
.Fn ReaddirPlus
@ -251,29 +238,10 @@ Do not use a reserved port number for RPCs.
This option is provided only to be able to mimic the old
default behavior of not using a reserved port, and should rarely be useful.
.It Fl q
Use the leasing extensions to the
.Tn NFS
Version 3 protocol
to maintain cache consistency.
This protocol version 2 revision to Not Quite
.Tn NFS
.Pq Tn NQNFS
is only supported by this updated release of
.Tn NFS
code.
It is not backwards compatible with the version 1
.Tn NQNFS
protocol that was part of the first release of
.Bx 4.4 Lite .
To interoperate with a first release
.Bx 4.4 Lite
.Tn NFS
system you will have to avoid this option until you have had
an opportunity to upgrade the
.Tn NFS
code to release 2 of
.Bx 4.4 Lite
on all your systems.
A synonym of
.Fl 3 .
It used to specify
.Tn NQNFS .
.It Fl r
Set the read data size to the specified value in bytes.
It should normally be a power of 2 greater than or equal to 1024.

37
sbin/mount_nfs/mount_nfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_nfs.c,v 1.52 2006/10/16 03:37:42 christos Exp $ */
/* $NetBSD: mount_nfs.c,v 1.53 2006/11/09 10:07:00 yamt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: mount_nfs.c,v 1.52 2006/10/16 03:37:42 christos Exp $");
__RCSID("$NetBSD: mount_nfs.c,v 1.53 2006/11/09 10:07:00 yamt Exp $");
#endif
#endif /* not lint */
@ -204,13 +204,14 @@ mount_nfs(int argc, char *argv[])
"23a:bcCdD:g:I:iKL:lm:o:PpqR:r:sTt:w:x:UX")) != -1)
switch (c) {
case '3':
case 'q':
if (force2)
errx(1, "-2 and -3 are mutually exclusive");
errx(1, "conflicting version options");
force3 = 1;
break;
case '2':
if (force3)
errx(1, "-2 and -3 are mutually exclusive");
errx(1, "conflicting version options");
force2 = 1;
nfsargsp->flags &= ~NFSMNT_NFSV3;
break;
@ -231,11 +232,7 @@ mount_nfs(int argc, char *argv[])
nfsargsp->flags &= ~NFSMNT_NOCONN;
break;
case 'D':
num = strtol(optarg, &p, 10);
if (*p || num <= 0)
errx(1, "illegal -D value -- %s", optarg);
nfsargsp->deadthresh = num;
nfsargsp->flags |= NFSMNT_DEADTHRESH;
/* ignore */
break;
case 'd':
nfsargsp->flags |= NFSMNT_DUMBTIMR;
@ -261,11 +258,7 @@ mount_nfs(int argc, char *argv[])
nfsargsp->flags |= NFSMNT_INT;
break;
case 'L':
num = strtol(optarg, &p, 10);
if (*p || num < 2)
errx(1, "illegal -L value -- %s", optarg);
nfsargsp->leaseterm = num;
nfsargsp->flags |= NFSMNT_LEASETERM;
/* ignore */
break;
case 'l':
nfsargsp->flags |= NFSMNT_RDIRPLUS;
@ -282,7 +275,7 @@ mount_nfs(int argc, char *argv[])
nfsargsp->flags |= NFSMNT_DUMBTIMR;
if (altflags & ALTF_INTR)
nfsargsp->flags |= NFSMNT_INT;
if (altflags & ALTF_NFSV3) {
if (altflags & (ALTF_NFSV3|ALTF_NQNFS)) {
if (force2)
errx(1, "conflicting version options");
force3 = 1;
@ -303,12 +296,6 @@ mount_nfs(int argc, char *argv[])
if (altflags & ALTF_SEQPACKET)
nfsargsp->sotype = SOCK_SEQPACKET;
#endif
if (altflags & ALTF_NQNFS) {
if (force2)
errx(1, "nqnfs only available with v3");
force3 = 1;
nfsargsp->flags |= NFSMNT_NQNFS;
}
if (altflags & ALTF_SOFT)
nfsargsp->flags |= NFSMNT_SOFT;
if (altflags & ALTF_TCP) {
@ -375,12 +362,6 @@ mount_nfs(int argc, char *argv[])
case 'p':
nfsargsp->flags &= ~NFSMNT_RESVPORT;
break;
case 'q':
if (force2)
errx(1, "nqnfs only available with v3");
force3 = 1;
nfsargsp->flags |= NFSMNT_NQNFS;
break;
case 'R':
num = strtol(optarg, &p, 10);
if (*p || num <= 0)
@ -486,7 +467,7 @@ retry:
return (0);
}
if (nfsargsp->flags & (NFSMNT_NQNFS | NFSMNT_KERB)) {
if (nfsargsp->flags & NFSMNT_KERB) {
if ((opflags & ISBGRND) == 0) {
if ((i = fork()) != 0) {
if (i == -1)