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

Add code to try the nmount(2) syscall when mount(2) failed with

Browse Source 
EOPNOTSUPP.  This will make things less painful when I will commit
the conversion of devfs, fdescfs and pseudofs to nmount.

Reviewed by:	phk
This commit is contained in:
Maxime Henrion 2002-04-07 13:28:18 +00:00
parent 47f7268805
commit c31e07fb1a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94094
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sbin/mount_std/mount_std.c
View File

@ -48,8 +48,10 @@ static const char rcsid[] =
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/uio.h>
#include <err.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -74,6 +76,7 @@ main(argc, argv)
int ch, mntflags;
char mntpath[MAXPATHLEN];
struct vfsconf vfc;
struct iovec iov[4];
int error;
/*
@ -121,7 +124,25 @@ main(argc, argv)
/* resolve the mountpoint with realpath(3) */
(void)checkpath(argv[1], mntpath);
if (mount(vfc.vfc_name, mntpath, mntflags, NULL))
error = mount(vfc.vfc_name, mntpath, mntflags, NULL);
/*
* Try with the new mount syscall in the case
* this filesystem has been converted.
*/
if (error && errno == EOPNOTSUPP) {
iov[0].iov_base = "fstype";
iov[0].iov_len = sizeof("fstype");
iov[1].iov_base = vfc.vfc_name;
iov[1].iov_len = strlen(vfc.vfc_name) + 1;
iov[2].iov_base = "fspath";
iov[2].iov_len = sizeof("fstype");
iov[3].iov_base = mntpath;
iov[3].iov_len = strlen(mntpath) + 1;
error = nmount(iov, 4, mntflags);
}
if (error)
err(EX_OSERR, NULL);
exit(0);
}