2a3e5eeb7c
- Remove all NFS related stuff from file system specific code. - Drop the vfs_checkexp hook and generalize it in the new nfs_check_export function, thus removing redundancy from all file systems. - Move all NFS export-related stuff from kern/vfs_subr.c to the new file sys/nfs/nfs_export.c. The former was becoming large and its code is always compiled, regardless of the build options. Using the latter, the code is only compiled in when NFSSERVER is enabled. While doing this, also make some functions in nfs_subs.c conditional to NFSSERVER. - Add a new command in nfssvc(2), called NFSSVC_SETEXPORTSLIST, that takes a path and a set of export entries. At the moment it can only clear the exports list or append entries, one by one, but it is done in a way that allows setting the whole set of entries atomically in the future (see the comment in mountd_set_exports_list or in doc/TODO). - Change mountd(8) to use the nfssvc(2) system call instead of mount(2) so that it becomes file system agnostic. In fact, all this whole thing was done to remove a 'XXX' block from this utility! - Change the mount*, newfs and fsck* userland utilities to not deal with NFS exports initialization; done internally by the kernel when initializing the NFS support for each file system. - Implement an interface for VFS (called VFS hooks) so that several kernel subsystems can run arbitrary code upon receipt of specific VFS events. At the moment, this only provides support for unmount and is used to destroy NFS exports lists from the file systems being unmounted, though it has room for extension. Thanks go to yamt@, chs@, thorpej@, wrstuden@ and others for their comments and advice in the development of this patch.
152 lines
4.1 KiB
C
152 lines
4.1 KiB
C
/* $NetBSD: mount_ffs.c,v 1.18 2005/09/23 12:10:35 jmmv Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
#ifndef lint
|
|
__COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
|
|
The Regents of the University of California. All rights reserved.\n");
|
|
#endif /* not lint */
|
|
|
|
#ifndef lint
|
|
#if 0
|
|
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
|
|
#else
|
|
__RCSID("$NetBSD: mount_ffs.c,v 1.18 2005/09/23 12:10:35 jmmv Exp $");
|
|
#endif
|
|
#endif /* not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/mount.h>
|
|
#include <ufs/ufs/ufsmount.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <mntopts.h>
|
|
|
|
static void ffs_usage(void);
|
|
int mount_ffs(int argc, char **argv);
|
|
|
|
static const struct mntopt mopts[] = {
|
|
MOPT_STDOPTS,
|
|
MOPT_ASYNC,
|
|
MOPT_SYNC,
|
|
MOPT_UPDATE,
|
|
MOPT_RELOAD,
|
|
MOPT_NOATIME,
|
|
MOPT_NODEVMTIME,
|
|
MOPT_FORCE,
|
|
MOPT_SOFTDEP,
|
|
MOPT_GETARGS,
|
|
{ NULL }
|
|
};
|
|
|
|
#ifndef MOUNT_NOMAIN
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
return mount_ffs(argc, argv);
|
|
}
|
|
#endif
|
|
|
|
int
|
|
mount_ffs(int argc, char *argv[])
|
|
{
|
|
struct ufs_args args;
|
|
int ch, mntflags;
|
|
char fs_name[MAXPATHLEN], canon_dev[MAXPATHLEN];
|
|
const char *errcause;
|
|
|
|
mntflags = 0;
|
|
optind = optreset = 1; /* Reset for parse of new argv. */
|
|
while ((ch = getopt(argc, argv, "o:")) != -1)
|
|
switch (ch) {
|
|
case 'o':
|
|
getmntopts(optarg, mopts, &mntflags, 0);
|
|
break;
|
|
case '?':
|
|
default:
|
|
ffs_usage();
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 2)
|
|
ffs_usage();
|
|
|
|
if (realpath(argv[0], canon_dev) == NULL) /* Check device path */
|
|
err(1, "realpath %s", argv[0]);
|
|
if (strncmp(argv[0], canon_dev, MAXPATHLEN)) {
|
|
warnx("\"%s\" is a relative path.", argv[0]);
|
|
warnx("using \"%s\" instead.", canon_dev);
|
|
}
|
|
args.fspec = canon_dev;
|
|
|
|
if (realpath(argv[1], fs_name) == NULL) /* Check mounton path */
|
|
err(1, "realpath %s", argv[1]);
|
|
if (strncmp(argv[1], fs_name, MAXPATHLEN)) {
|
|
warnx("\"%s\" is a relative path.", argv[1]);
|
|
warnx("using \"%s\" instead.", fs_name);
|
|
}
|
|
|
|
if (mount(MOUNT_FFS, fs_name, mntflags, &args) < 0) {
|
|
switch (errno) {
|
|
case EMFILE:
|
|
errcause = "mount table full";
|
|
break;
|
|
case EINVAL:
|
|
if (mntflags & MNT_UPDATE)
|
|
errcause =
|
|
"specified device does not match mounted device";
|
|
else
|
|
errcause = "incorrect super block";
|
|
break;
|
|
default:
|
|
errcause = strerror(errno);
|
|
break;
|
|
}
|
|
errx(1, "%s on %s: %s", args.fspec, fs_name, errcause);
|
|
}
|
|
exit(0);
|
|
}
|
|
|
|
static void
|
|
ffs_usage(void)
|
|
{
|
|
(void)fprintf(stderr, "usage: mount_ffs [-o options] special node\n");
|
|
exit(1);
|
|
}
|