1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00

Changed #ifdef COMPAT_PRELITE2' to #ifndef NO_COMPAT_PRELITE2' so that

old nfs mount calls are supported by default.
This commit is contained in:
Bruce Evans 1997-02-18 04:40:38 +00:00
parent 2b76b18065
commit bd6d39b941
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=22871
2 changed files with 10 additions and 10 deletions

View File

@ -529,7 +529,7 @@ nfs_mountdiskless(path, which, mountflag, sin, args, p, vpp, mpp)
return (0);
}
#ifdef COMPAT_PRELITE2
#ifndef NO_COMPAT_PRELITE2
/*
* Old arguments to mount NFS
*/
@ -552,7 +552,7 @@ struct onfs_args {
int deadthresh; /* Retrans threshold */
char *hostname; /* server's name */
};
#endif
#endif /* !NO_COMPAT_PRELITE2 */
/*
* VFS Operations.
@ -584,7 +584,7 @@ nfs_mount(mp, path, data, ndp, p)
if (error)
return (error);
if (args.version != NFS_ARGSVERSION) {
#ifdef COMPAT_PRELITE2
#ifndef NO_COMPAT_PRELITE2
/*
* If the argument version is unknown, then assume the
* caller is a pre-lite2 4.4BSD client and convert its
@ -612,9 +612,9 @@ nfs_mount(mp, path, data, ndp, p)
args.leaseterm = oargs.leaseterm;
args.deadthresh = oargs.deadthresh;
args.hostname = oargs.hostname;
#else /* COMPAT_PRELITE2 */
#else /* NO_COMPAT_PRELITE2 */
return (EPROGMISMATCH);
#endif /* COMPAT_PRELITE2 */
#endif /* !NO_COMPAT_PRELITE2 */
}
error = copyin((caddr_t)args.fh, (caddr_t)nfh, args.fhsize);
if (error)

View File

@ -529,7 +529,7 @@ nfs_mountdiskless(path, which, mountflag, sin, args, p, vpp, mpp)
return (0);
}
#ifdef COMPAT_PRELITE2
#ifndef NO_COMPAT_PRELITE2
/*
* Old arguments to mount NFS
*/
@ -552,7 +552,7 @@ struct onfs_args {
int deadthresh; /* Retrans threshold */
char *hostname; /* server's name */
};
#endif
#endif /* !NO_COMPAT_PRELITE2 */
/*
* VFS Operations.
@ -584,7 +584,7 @@ nfs_mount(mp, path, data, ndp, p)
if (error)
return (error);
if (args.version != NFS_ARGSVERSION) {
#ifdef COMPAT_PRELITE2
#ifndef NO_COMPAT_PRELITE2
/*
* If the argument version is unknown, then assume the
* caller is a pre-lite2 4.4BSD client and convert its
@ -612,9 +612,9 @@ nfs_mount(mp, path, data, ndp, p)
args.leaseterm = oargs.leaseterm;
args.deadthresh = oargs.deadthresh;
args.hostname = oargs.hostname;
#else /* COMPAT_PRELITE2 */
#else /* NO_COMPAT_PRELITE2 */
return (EPROGMISMATCH);
#endif /* COMPAT_PRELITE2 */
#endif /* !NO_COMPAT_PRELITE2 */
}
error = copyin((caddr_t)args.fh, (caddr_t)nfh, args.fhsize);
if (error)