mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/nfs/nfs_vfsops.c
View File

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

10
sys/nfsclient/nfs_vfsops.c
View File

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