d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't configure compatibility code for pre-Lite2 mount() calls by

Browse Source 
default.  This code should go away soon.
This commit is contained in:
Bruce Evans 1998-08-12 20:17:42 +00:00
parent 001ca7cc09
commit 13950bd2ed
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=38289
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/vfs_export.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.158 1998/07/11 07:45:43 bde Exp $
* $Id: vfs_subr.c,v 1.159 1998/07/12 16:45:39 dfr Exp $
*/
/*
@ -1992,7 +1992,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
u_int namelen = arg2 + 1; /* XXX */
struct vfsconf *vfsp;
#ifndef NO_COMPAT_PRELITE2
#ifdef COMPAT_PRELITE2
/* Resolve ambiguity between VFS_VFSCONF and VFS_GENERIC. */
if (namelen == 1)
return (sysctl_ovfs_conf(oidp, arg1, arg2, req));
@ -2033,7 +2033,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl,
"Generic filesystem");
#ifndef NO_COMPAT_PRELITE2
#ifdef COMPAT_PRELITE2
static int
sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
@ -2055,7 +2055,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
return 0;
}
#endif /* !NO_COMPAT_PRELITE2 */
#endif /* COMPAT_PRELITE2 */
static volatile int kinfo_vdebug = 1;

8
sys/kern/vfs_subr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.158 1998/07/11 07:45:43 bde Exp $
* $Id: vfs_subr.c,v 1.159 1998/07/12 16:45:39 dfr Exp $
*/
/*
@ -1992,7 +1992,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
u_int namelen = arg2 + 1; /* XXX */
struct vfsconf *vfsp;
#ifndef NO_COMPAT_PRELITE2
#ifdef COMPAT_PRELITE2
/* Resolve ambiguity between VFS_VFSCONF and VFS_GENERIC. */
if (namelen == 1)
return (sysctl_ovfs_conf(oidp, arg1, arg2, req));
@ -2033,7 +2033,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl,
"Generic filesystem");
#ifndef NO_COMPAT_PRELITE2
#ifdef COMPAT_PRELITE2
static int
sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
@ -2055,7 +2055,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
return 0;
}
#endif /* !NO_COMPAT_PRELITE2 */
#endif /* COMPAT_PRELITE2 */
static volatile int kinfo_vdebug = 1;

8
sys/nfs/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
* $Id: nfs_vfsops.c,v 1.71 1998/06/01 11:07:16 peter Exp $
* $Id: nfs_vfsops.c,v 1.72 1998/06/07 17:12:30 dfr Exp $
*/
#include <sys/param.h>
@ -759,7 +759,7 @@ nfs_mount(mp, path, data, ndp, p)
if (error)
return (error);
if (args.version != NFS_ARGSVERSION) {
#ifndef NO_COMPAT_PRELITE2
#ifdef COMPAT_PRELITE2
/*
* If the argument version is unknown, then assume the
* caller is a pre-lite2 4.4BSD client and convert its
@ -770,9 +770,9 @@ nfs_mount(mp, path, data, ndp, p)
if (error)
return (error);
nfs_convert_oargs(&args,&oargs);
#else /* NO_COMPAT_PRELITE2 */
#else /* !COMPAT_PRELITE2 */
return (EPROGMISMATCH);
#endif /* !NO_COMPAT_PRELITE2 */
#endif /* COMPAT_PRELITE2 */
}
if (mp->mnt_flag & MNT_UPDATE) {
register struct nfsmount *nmp = VFSTONFS(mp);

8
sys/nfsclient/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
* $Id: nfs_vfsops.c,v 1.71 1998/06/01 11:07:16 peter Exp $
* $Id: nfs_vfsops.c,v 1.72 1998/06/07 17:12:30 dfr Exp $
*/
#include <sys/param.h>
@ -759,7 +759,7 @@ nfs_mount(mp, path, data, ndp, p)
if (error)
return (error);
if (args.version != NFS_ARGSVERSION) {
#ifndef NO_COMPAT_PRELITE2
#ifdef COMPAT_PRELITE2
/*
* If the argument version is unknown, then assume the
* caller is a pre-lite2 4.4BSD client and convert its
@ -770,9 +770,9 @@ nfs_mount(mp, path, data, ndp, p)
if (error)
return (error);
nfs_convert_oargs(&args,&oargs);
#else /* NO_COMPAT_PRELITE2 */
#else /* !COMPAT_PRELITE2 */
return (EPROGMISMATCH);
#endif /* !NO_COMPAT_PRELITE2 */
#endif /* COMPAT_PRELITE2 */
}
if (mp->mnt_flag & MNT_UPDATE) {
register struct nfsmount *nmp = VFSTONFS(mp);