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

Use the version of the kernel returned by getosreldate()

Browse Source 
to determine whether to call the fallback_mount() backwards
compatibility function or not.

Reviewed by:	dfr
This commit is contained in:
rodrigc 2008-09-19 11:59:10 +00:00
parent d1938e477b
commit ce45fb3cfc
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/mount_nfs/mount_nfs.c
View File

@ -164,19 +164,19 @@ enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec,
enum tryret nfs4_tryproto(struct addrinfo *ai, char *hostp, char *spec,
char **errstr);
enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr);
extern int getosreldate(void);
int
main(int argc, char *argv[])
{
int c;
struct iovec *iov;
int mntflags, altflags, num;
int iovlen;
int mntflags, num, iovlen;
int osversion;
char *name, *p, *spec, *fstype;
char mntpath[MAXPATHLEN], errmsg[255];
mntflags = 0;
altflags = 0;
iov = NULL;
iovlen = 0;
memset(errmsg, 0, sizeof(errmsg));
@ -403,9 +403,19 @@ main(int argc, char *argv[])
build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
if (nmount(iov, iovlen, mntflags)) {
if (errno != ENOENT
|| fallback_mount(iov, iovlen, mntflags))
/*
* XXX:
* Backwards compatibility routines for older kernels.
* Remove this and fallback_mount() code when we do not need to support
* NFS mounts against older kernels which still need
* struct nfs_args to be passed in via nmount().
*/
osversion = getosreldate();
if (osversion >= 800048) {
if (nmount(iov, iovlen, mntflags))
err(1, "%s, %s", mntpath, errmsg);
} else {
if (fallback_mount(iov, iovlen, mntflags))
err(1, "%s, %s", mntpath, errmsg);
}