Get rid of NQNFS options

3 files changed, 7 insertions, 61 deletions

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 9824e57f620..2b7ddf27962 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.c,v 1.21 2001/03/12 01:30:24 deraadt Exp $	*/
+/*	$OpenBSD: mount.c,v 1.22 2001/06/24 17:03:16 csapuntz Exp $	*/
 /*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c	8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.21 2001/03/12 01:30:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mount.c,v 1.22 2001/06/24 17:03:16 csapuntz Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,6 @@ static char rcsid[] = "$OpenBSD: mount.c,v 1.21 2001/03/12 01:30:24 deraadt Exp
 #define _KERNEL
 #include <nfs/nfs.h>
 #undef _KERNEL
-#include <nfs/nqnfs.h>
 
 #include <err.h>
 #include <errno.h>
@@ -472,7 +471,6 @@ prmount(sf)
 		struct nfs_args *nfs_args = &sf->mount_info.nfs_args;
 
 		(void)printf("%s%s", !f++ ? " (" : ", ",
-		    (nfs_args->flags & NFSMNT_NQNFS) ? "nqnfs" :
 		    (nfs_args->flags & NFSMNT_NFSV3) ? "v3" : "v2");
 		if (nfs_args->proto && (pr = getprotobynumber(nfs_args->proto)))
 			(void)printf("%s%s", !f++ ? " (" : ", ", pr->p_name);
@@ -508,14 +506,6 @@ prmount(sf)
 		if (verbose || nfs_args->readahead != NFS_DEFRAHEAD)
 			(void)printf("%s%s=%d", !f++ ? " (" : ", ",
 			    "readahead", nfs_args->readahead);
-		if (nfs_args->flags & NFSMNT_NQNFS) {
-			if (verbose || nfs_args->leaseterm != NQ_DEFLEASE)
-				(void)printf("%s%s=%d", !f++ ? " (" : ", ",
-				    "leaseterm", nfs_args->leaseterm);
-			if (verbose || nfs_args->deadthresh != NQ_DEADTHRESH)
-				(void)printf("%s%s=%d", !f++ ? " (" : ", ",
-				    "deadthresh", nfs_args->deadthresh);
-		}
 	} else if (strcmp(sf->f_fstypename, MOUNT_MFS) == 0) {
 		int headerlen;
 		long blocksize;
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 31cee3c9f8e..9e86f6f45b0 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_nfs.8,v 1.22 2001/06/08 13:46:50 aaron Exp $
+.\"	$OpenBSD: mount_nfs.8,v 1.23 2001/06/24 17:03:18 csapuntz Exp $
 .\"	$NetBSD: mount_nfs.8,v 1.3 1996/02/18 11:59:10 fvdl Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994, 1995
@@ -79,19 +79,6 @@ Use the NFS Version 2 protocol.
 Use the NFS Version 3 protocol.
 The default is to try version 3 first, and
 fall back to version 2 if the mount fails.
-.It Fl D Ar deadthresh
-Used with 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.
 .It Fl I Ar readdirsize
 Set the readdir read size to the specified value.
 The value should normally
@@ -103,10 +90,6 @@ This requires that the kernel be built with the NFSKERB option.
 (Refer to the INTERNET-DRAFT titled
 .%T "Authentication Mechanisms for ONC RPC" ,
 for more information.)
-.It Fl L Ar leaseterm
-Used with 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.
 .It Fl P
 The kernel always uses a reserved port number to communicate with
 clients.
@@ -159,7 +142,7 @@ Make the mount interruptible, which implies that file system calls that
 are delayed due to an unresponsive server will fail with EINTR when a
 termination signal is posted for the process.
 .It Fl l
-Used with NQNFS and NFSV3 to specify that the \fBReaddirPlus\fR RPC should
+Used with NFSV3 to specify that the \fBReaddirPlus\fR RPC should
 be used.
 This option reduces RPC traffic for cases such as
 .Dq "ls -l" ,
@@ -186,16 +169,6 @@ The following NFS specific option is also available:
 Use specified port number for NFS requests.
 The default is to query the portmapper for the NFS port.
 .El
-.It Fl q
-Use the leasing extensions to the NFS Version 3 protocol
-to maintain cache consistency.
-This protocol version 2 revision to Not Quite Nfs (NQNFS)
-is only supported by this updated release of NFS code.
-It is not backwards compatible with the version 1 NQNFS protocol
-that was part of the first release of 4.4BSD-Lite.
-To interoperate with a first release 4.4BSD-Lite NFS system you will have to
-avoid this option until you have had an opportunity to upgrade the NFS code
-to release 2 of 4.4BSD-Lite on all your systems.
 .It Fl r Ar readsize
 Set the read data size to the specified value.
 It should normally be a power of 2 greater than or equal to 1024.
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 4988c42a6ae..2d2dbc29d59 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_nfs.c,v 1.19 2001/05/11 18:09:08 mickey Exp $	*/
+/*	$OpenBSD: mount_nfs.c,v 1.20 2001/06/24 17:03:19 csapuntz Exp $	*/
 /*	$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $	*/
 
 /*
@@ -76,7 +76,6 @@ static char rcsid[] = "$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl
 #define _KERNEL
 #include <nfs/nfs.h>
 #undef _KERNEL
-#include <nfs/nqnfs.h>
 
 #include <arpa/inet.h>
 
@@ -103,7 +102,6 @@ static char rcsid[] = "$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl
 #define	ALTF_MNTUDP	0x80
 #define ALTF_RESVPORT	0x100
 #define ALTF_SEQPACKET	0x200
-#define ALTF_NQNFS	0x400
 #define ALTF_SOFT	0x800
 #define ALTF_TCP	0x1000
 #define ALTF_PORT	0x2000
@@ -127,7 +125,6 @@ const struct mntopt mopts[] = {
 #ifdef ISO
 	{ "seqpacket", 0, ALTF_SEQPACKET, 1 },
 #endif
-	{ "nqnfs", 0, ALTF_NQNFS, 1 },
 	{ "soft", 0, ALTF_SOFT, 1 },
 	{ "tcp", 0, ALTF_TCP, 1 },
 	{ "port", 0, ALTF_PORT, 1 },
@@ -151,8 +148,6 @@ struct nfs_args nfsdefargs = {
 	NFS_RETRANS,
 	NFS_MAXGRPS,
 	NFS_DEFRAHEAD,
-	NQ_DEFLEASE,
-	NQ_DEADTHRESH,
 	(char *)0,
 };
 
@@ -343,12 +338,6 @@ main(argc, 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) {
@@ -367,12 +356,6 @@ main(argc, argv)
 			nfsargsp->sotype = SOCK_SEQPACKET;
 			break;
 #endif
-		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)
@@ -438,11 +421,11 @@ main(argc, argv)
 		else
 			err(1, "%s", name);
 	}
-	if (nfsargsp->flags & (NFSMNT_NQNFS | NFSMNT_KERB)) {
+	if (nfsargsp->flags & NFSMNT_KERB) {
 		if ((opflags & ISBGRND) == 0) {
 			if (i = fork()) {
 				if (i == -1)
-					err(1, "nqnfs 1");
+					err(1, "Couldn't launch NFS kerberos service process");
 				exit(0);
 			}
 			(void) setsid();