Index: sbin/tunefs/tunefs.c =================================================================== --- sbin/tunefs/tunefs.c (revision 203014) +++ sbin/tunefs/tunefs.c (working copy) @@ -79,13 +79,10 @@ main(int argc, char *argv[]) char *avalue, *Jvalue, *Lvalue, *lvalue, *Nvalue, *nvalue; const char *special, *on; const char *name; - int active; int Aflag, aflag, eflag, evalue, fflag, fvalue, Jflag, Lflag, lflag; int mflag, mvalue, Nflag, nflag, oflag, ovalue, pflag, sflag, svalue; int ch, found_arg, i; const char *chg[2]; - struct ufs_args args; - struct statfs stfs; if (argc < 3) usage(); @@ -93,7 +90,6 @@ main(int argc, char *argv[]) Nflag = nflag = oflag = pflag = sflag = 0; avalue = Jvalue = Lvalue = lvalue = Nvalue = nvalue = NULL; evalue = fvalue = mvalue = ovalue = svalue = 0; - active = 0; found_arg = 0; /* At least one arg is required. */ while ((ch = getopt(argc, argv, "Aa:e:f:J:L:l:m:N:n:o:ps:")) != -1) switch (ch) { @@ -251,12 +247,6 @@ main(int argc, char *argv[]) on = special = argv[0]; if (ufs_disk_fillout(&disk, special) == -1) goto err; - if (disk.d_name != special) { - special = disk.d_name; - if (statfs(special, &stfs) == 0 && - strcmp(special, stfs.f_mntonname) == 0) - active = 1; - } if (pflag) { printfs(); @@ -440,13 +430,6 @@ main(int argc, char *argv[]) if (sbwrite(&disk, Aflag) == -1) goto err; ufs_disk_close(&disk); - if (active) { - bzero(&args, sizeof(args)); - if (mount("ufs", on, - stfs.f_flags | MNT_UPDATE | MNT_RELOAD, &args) < 0) - err(9, "%s: reload", special); - warnx("file system reloaded"); - } exit(0); err: if (disk.d_error != NULL) Index: sbin/tunefs/tunefs.8 =================================================================== --- sbin/tunefs/tunefs.8 (revision 203014) +++ sbin/tunefs/tunefs.8 (working copy) @@ -57,9 +57,7 @@ utility is designed to change the dynamic paramete which affect the layout policies. The .Nm -utility cannot be run on an active file system. -To change an active file system, -it must be downgraded to read-only or unmounted. +utility cannot be run on a mounted file system. .Pp The parameters which are to be changed are indicated by the flags given below: @@ -168,7 +166,7 @@ The utility appeared in .Bx 4.2 . .Sh BUGS -This utility does not work on active file systems. +This utility does not work on mounted file systems. To change the root file system, the system must be rebooted after the file system is tuned. .\" Take this out and a Unix Daemon will dog your steps from now until Index: sys/nfsclient/nfs_vfsops.c =================================================================== --- sys/nfsclient/nfs_vfsops.c (revision 203014) +++ sys/nfsclient/nfs_vfsops.c (working copy) @@ -116,7 +116,6 @@ static int mountnfs(struct nfs_args *, struct moun struct sockaddr *, char *, struct vnode **, struct ucred *cred, int); static vfs_mount_t nfs_mount; -static vfs_cmount_t nfs_cmount; static vfs_unmount_t nfs_unmount; static vfs_root_t nfs_root; static vfs_statfs_t nfs_statfs; @@ -131,7 +130,6 @@ static int fake_wchan; static struct vfsops nfs_vfsops = { .vfs_init = nfs_init, .vfs_mount = nfs_mount, - .vfs_cmount = nfs_cmount, .vfs_root = nfs_root, .vfs_statfs = nfs_statfs, .vfs_sync = nfs_sync, @@ -1156,23 +1154,6 @@ out: * doing the sockargs() call because sockargs() allocates an mbuf and * an error after that means that I have to release the mbuf. */ -/* ARGSUSED */ -static int -nfs_cmount(struct mntarg *ma, void *data, int flags) -{ - int error; - struct nfs_args args; - - error = copyin(data, &args, sizeof (struct nfs_args)); - if (error) - return error; - - ma = mount_arg(ma, "nfs_args", &args, sizeof args); - - error = kernel_mount(ma, flags); - return (error); -} - /* * Common code for mount and mountroot */ Index: sys/gnu/fs/reiserfs/reiserfs_vfsops.c =================================================================== --- sys/gnu/fs/reiserfs/reiserfs_vfsops.c (revision 203014) +++ sys/gnu/fs/reiserfs/reiserfs_vfsops.c (working copy) @@ -20,7 +20,6 @@ const char reiserfs_jr_magic_string[] = REISER2FS */ int reiserfs_default_io_size = 128 * 1024; -static vfs_cmount_t reiserfs_cmount; static vfs_fhtovp_t reiserfs_fhtovp; static vfs_mount_t reiserfs_mount; static vfs_root_t reiserfs_root; @@ -48,24 +47,6 @@ MALLOC_DEFINE(M_REISERFSNODE, "reiserfs_node", "Re * VFS operations * -------------------------------------------------------------------*/ -static int -reiserfs_cmount(struct mntarg *ma, void *data, int flags) -{ - struct reiserfs_args args; - int error; - - error = copyin(data, &args, sizeof(args)); - if (error) - return (error); - - ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); - ma = mount_arg(ma, "export", &args.export, sizeof args.export); - - error = kernel_mount(ma, flags); - - return (error); -} - /* * Mount system call */ @@ -1108,7 +1089,6 @@ hash_function(struct reiserfs_mount *rmp) * -------------------------------------------------------------------*/ static struct vfsops reiser_vfsops = { - .vfs_cmount = reiserfs_cmount, .vfs_mount = reiserfs_mount, .vfs_unmount = reiserfs_unmount, //.vfs_checkexp = reiserfs_checkexp, Index: sys/ufs/ffs/ffs_vfsops.c =================================================================== --- sys/ufs/ffs/ffs_vfsops.c (revision 203014) +++ sys/ufs/ffs/ffs_vfsops.c (working copy) @@ -84,7 +84,6 @@ static void ffs_ifree(struct ufsmount *ump, struct static vfs_init_t ffs_init; static vfs_uninit_t ffs_uninit; static vfs_extattrctl_t ffs_extattrctl; -static vfs_cmount_t ffs_cmount; static vfs_unmount_t ffs_unmount; static vfs_mount_t ffs_mount; static vfs_statfs_t ffs_statfs; @@ -96,7 +95,6 @@ static struct vfsops ufs_vfsops = { .vfs_fhtovp = ffs_fhtovp, .vfs_init = ffs_init, .vfs_mount = ffs_mount, - .vfs_cmount = ffs_cmount, .vfs_quotactl = ufs_quotactl, .vfs_root = ufs_root, .vfs_statfs = ffs_statfs, @@ -444,29 +442,6 @@ ffs_mount(struct mount *mp) } /* - * Compatibility with old mount system call. - */ - -static int -ffs_cmount(struct mntarg *ma, void *data, int flags) -{ - struct ufs_args args; - int error; - - if (data == NULL) - return (EINVAL); - error = copyin(data, &args, sizeof args); - if (error) - return (error); - - ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); - ma = mount_arg(ma, "export", &args.export, sizeof args.export); - error = kernel_mount(ma, flags); - - return (error); -} - -/* * Reload all incore data for a filesystem (used after running fsck on * the root filesystem and finding things to fix). The filesystem must * be mounted read-only. Index: sys/kern/vfs_mount.c =================================================================== --- sys/kern/vfs_mount.c (revision 203014) +++ sys/kern/vfs_mount.c (working copy) @@ -749,50 +749,8 @@ mount(td, uap) caddr_t data; } */ *uap; { - char *fstype; - struct vfsconf *vfsp = NULL; - struct mntarg *ma = NULL; - int error; - AUDIT_ARG_FFLAGS(uap->flags); - - /* - * Filter out MNT_ROOTFS. We do not want clients of mount() in - * userspace to set this flag, but we must filter it out if we want - * MNT_UPDATE on the root file system to work. - * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). - */ - uap->flags &= ~MNT_ROOTFS; - - fstype = malloc(MFSNAMELEN, M_TEMP, M_WAITOK); - error = copyinstr(uap->type, fstype, MFSNAMELEN, NULL); - if (error) { - free(fstype, M_TEMP); - return (error); - } - - AUDIT_ARG_TEXT(fstype); - mtx_lock(&Giant); - vfsp = vfs_byname_kld(fstype, td, &error); - free(fstype, M_TEMP); - if (vfsp == NULL) { - mtx_unlock(&Giant); - return (ENOENT); - } - if (vfsp->vfc_vfsops->vfs_cmount == NULL) { - mtx_unlock(&Giant); - return (EOPNOTSUPP); - } - - ma = mount_argsu(ma, "fstype", uap->type, MNAMELEN); - ma = mount_argsu(ma, "fspath", uap->path, MNAMELEN); - ma = mount_argb(ma, uap->flags & MNT_RDONLY, "noro"); - ma = mount_argb(ma, !(uap->flags & MNT_NOSUID), "nosuid"); - ma = mount_argb(ma, !(uap->flags & MNT_NOEXEC), "noexec"); - - error = vfsp->vfc_vfsops->vfs_cmount(ma, uap->data, uap->flags); - mtx_unlock(&Giant); - return (error); + return (EOPNOTSUPP); } Index: sys/fs/nfsclient/nfs_clvfsops.c =================================================================== --- sys/fs/nfsclient/nfs_clvfsops.c (revision 203014) +++ sys/fs/nfsclient/nfs_clvfsops.c (working copy) @@ -101,7 +101,6 @@ static int mountnfs(struct nfs_args *, struct moun struct sockaddr *, char *, u_char *, u_char *, u_char *, struct vnode **, struct ucred *, struct thread *); static vfs_mount_t nfs_mount; -static vfs_cmount_t nfs_cmount; static vfs_unmount_t nfs_unmount; static vfs_root_t nfs_root; static vfs_statfs_t nfs_statfs; @@ -114,7 +113,6 @@ static vfs_sysctl_t nfs_sysctl; static struct vfsops nfs_vfsops = { .vfs_init = ncl_init, .vfs_mount = nfs_mount, - .vfs_cmount = nfs_cmount, .vfs_root = nfs_root, .vfs_statfs = nfs_statfs, .vfs_sync = nfs_sync, @@ -1010,23 +1008,7 @@ out: * doing the sockargs() call because sockargs() allocates an mbuf and * an error after that means that I have to release the mbuf. */ -/* ARGSUSED */ -static int -nfs_cmount(struct mntarg *ma, void *data, int flags) -{ - int error; - struct nfs_args args; - error = copyin(data, &args, sizeof (struct nfs_args)); - if (error) - return error; - - ma = mount_arg(ma, "nfs_args", &args, sizeof args); - - error = kernel_mount(ma, flags); - return (error); -} - /* * Common code for mount and mountroot */ Index: sys/fs/pseudofs/pseudofs.c =================================================================== --- sys/fs/pseudofs/pseudofs.c (revision 203014) +++ sys/fs/pseudofs/pseudofs.c (working copy) @@ -327,18 +327,6 @@ pfs_mount(struct pfs_info *pi, struct mount *mp) } /* - * Compatibility shim for old mount(2) system call - */ -int -pfs_cmount(struct mntarg *ma, void *data, int flags) -{ - int error; - - error = kernel_mount(ma, flags); - return (error); -} - -/* * Unmount a pseudofs instance */ int Index: sys/fs/pseudofs/pseudofs.h =================================================================== --- sys/fs/pseudofs/pseudofs.h (revision 203014) +++ sys/fs/pseudofs/pseudofs.h (working copy) @@ -242,7 +242,6 @@ struct pfs_node { * VFS interface */ int pfs_mount (struct pfs_info *pi, struct mount *mp); -int pfs_cmount (struct mntarg *ma, void *data, int flags); int pfs_unmount (struct mount *mp, int mntflags); int pfs_root (struct mount *mp, int flags, struct vnode **vpp); @@ -295,7 +294,6 @@ _##name##_uninit(struct vfsconf *vfc) { \ } \ \ static struct vfsops name##_vfsops = { \ - .vfs_cmount = pfs_cmount, \ .vfs_init = _##name##_init, \ .vfs_mount = _##name##_mount, \ .vfs_root = pfs_root, \ Index: sys/fs/portalfs/portal_vfsops.c =================================================================== --- sys/fs/portalfs/portal_vfsops.c (revision 203014) +++ sys/fs/portalfs/portal_vfsops.c (working copy) @@ -67,25 +67,6 @@ static const char *portal_opts[] = { NULL }; -static int -portal_cmount(struct mntarg *ma, void *data, int flags) -{ - struct portal_args args; - int error; - - if (data == NULL) - return (EINVAL); - error = copyin(data, &args, sizeof args); - if (error) - return (error); - - ma = mount_argf(ma, "socket", "%d", args.pa_socket); - ma = mount_argsu(ma, "config", args.pa_config, MAXPATHLEN); - error = kernel_mount(ma, flags); - - return (error); -} - /* * Mount the per-process file descriptors (/dev/fd) */ @@ -247,7 +228,6 @@ portal_statfs(mp, sbp) } static struct vfsops portal_vfsops = { - .vfs_cmount = portal_cmount, .vfs_mount = portal_mount, .vfs_root = portal_root, .vfs_statfs = portal_statfs, Index: sys/fs/hpfs/hpfs_vfsops.c =================================================================== --- sys/fs/hpfs/hpfs_vfsops.c (revision 203014) +++ sys/fs/hpfs/hpfs_vfsops.c (working copy) @@ -63,40 +63,11 @@ static int hpfs_mountfs(register struct vnode *, s static vfs_fhtovp_t hpfs_fhtovp; static vfs_vget_t hpfs_vget; -static vfs_cmount_t hpfs_cmount; static vfs_mount_t hpfs_mount; static vfs_root_t hpfs_root; static vfs_statfs_t hpfs_statfs; static vfs_unmount_t hpfs_unmount; -static int -hpfs_cmount ( - struct mntarg *ma, - void *data, - int flags) -{ - struct hpfs_args args; - int error; - - error = copyin(data, (caddr_t)&args, sizeof (struct hpfs_args)); - if (error) - return (error); - - ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); - ma = mount_arg(ma, "export", &args.export, sizeof args.export); - ma = mount_argf(ma, "uid", "%d", args.uid); - ma = mount_argf(ma, "gid", "%d", args.gid); - ma = mount_argf(ma, "mode", "%d", args.mode); - if (args.flags & HPFSMNT_TABLES) { - ma = mount_arg(ma, "d2u", args.d2u, sizeof args.d2u); - ma = mount_arg(ma, "u2d", args.u2d, sizeof args.u2d); - } - - error = kernel_mount(ma, flags); - - return (error); -} - static const char *hpfs_opts[] = { "from", "export", "uid", "gid", "mode", "d2u", "u2d", NULL }; @@ -532,7 +503,6 @@ hpfs_vget( static struct vfsops hpfs_vfsops = { .vfs_fhtovp = hpfs_fhtovp, - .vfs_cmount = hpfs_cmount, .vfs_mount = hpfs_mount, .vfs_root = hpfs_root, .vfs_statfs = hpfs_statfs, Index: sys/fs/smbfs/smbfs_vfsops.c =================================================================== --- sys/fs/smbfs/smbfs_vfsops.c (revision 203014) +++ sys/fs/smbfs/smbfs_vfsops.c (working copy) @@ -75,7 +75,6 @@ static MALLOC_DEFINE(M_SMBFSHASH, "smbfs_hash", "S static vfs_init_t smbfs_init; static vfs_uninit_t smbfs_uninit; -static vfs_cmount_t smbfs_cmount; static vfs_mount_t smbfs_mount; static vfs_root_t smbfs_root; static vfs_quotactl_t smbfs_quotactl; @@ -84,7 +83,6 @@ static vfs_unmount_t smbfs_unmount; static struct vfsops smbfs_vfsops = { .vfs_init = smbfs_init, - .vfs_cmount = smbfs_cmount, .vfs_mount = smbfs_mount, .vfs_quotactl = smbfs_quotactl, .vfs_root = smbfs_root, @@ -103,39 +101,6 @@ MODULE_DEPEND(smbfs, libmchain, 1, 1, 1); int smbfs_pbuf_freecnt = -1; /* start out unlimited */ -static int -smbfs_cmount(struct mntarg *ma, void * data, int flags) -{ - struct smbfs_args args; - int error; - - error = copyin(data, &args, sizeof(struct smbfs_args)); - if (error) - return error; - - if (args.version != SMBFS_VERSION) { - printf("mount version mismatch: kernel=%d, mount=%d\n", - SMBFS_VERSION, args.version); - return EINVAL; - } - ma = mount_argf(ma, "dev", "%d", args.dev); - ma = mount_argb(ma, args.flags & SMBFS_MOUNT_SOFT, "nosoft"); - ma = mount_argb(ma, args.flags & SMBFS_MOUNT_INTR, "nointr"); - ma = mount_argb(ma, args.flags & SMBFS_MOUNT_STRONG, "nostrong"); - ma = mount_argb(ma, args.flags & SMBFS_MOUNT_HAVE_NLS, "nohave_nls"); - ma = mount_argb(ma, !(args.flags & SMBFS_MOUNT_NO_LONG), "nolong"); - ma = mount_arg(ma, "rootpath", args.root_path, -1); - ma = mount_argf(ma, "uid", "%d", args.uid); - ma = mount_argf(ma, "gid", "%d", args.gid); - ma = mount_argf(ma, "file_mode", "%d", args.file_mode); - ma = mount_argf(ma, "dir_mode", "%d", args.dir_mode); - ma = mount_argf(ma, "caseopt", "%d", args.caseopt); - - error = kernel_mount(ma, flags); - - return (error); -} - static const char *smbfs_opts[] = { "dev", "soft", "intr", "strong", "have_nls", "long", "mountpoint", "rootpath", "uid", "gid", "file_mode", "dir_mode", Index: sys/fs/ntfs/ntfs_vfsops.c =================================================================== --- sys/fs/ntfs/ntfs_vfsops.c (revision 203014) +++ sys/fs/ntfs/ntfs_vfsops.c (working copy) @@ -76,7 +76,6 @@ static vfs_init_t ntfs_init; static vfs_uninit_t ntfs_uninit; static vfs_vget_t ntfs_vget; static vfs_fhtovp_t ntfs_fhtovp; -static vfs_cmount_t ntfs_cmount; static vfs_mount_t ntfs_mount; static vfs_root_t ntfs_root; static vfs_statfs_t ntfs_statfs; @@ -113,35 +112,6 @@ ntfs_uninit ( return 0; } -static int -ntfs_cmount ( - struct mntarg *ma, - void *data, - int flags) -{ - int error; - struct ntfs_args args; - - error = copyin(data, (caddr_t)&args, sizeof args); - if (error) - return (error); - ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); - ma = mount_arg(ma, "export", &args.export, sizeof args.export); - ma = mount_argf(ma, "uid", "%d", args.uid); - ma = mount_argf(ma, "gid", "%d", args.gid); - ma = mount_argf(ma, "mode", "%d", args.mode); - ma = mount_argb(ma, args.flag & NTFS_MFLAG_CASEINS, "nocaseins"); - ma = mount_argb(ma, args.flag & NTFS_MFLAG_ALLNAMES, "noallnames"); - if (args.flag & NTFS_MFLAG_KICONV) { - ma = mount_argsu(ma, "cs_ntfs", args.cs_ntfs, 64); - ma = mount_argsu(ma, "cs_local", args.cs_local, 64); - } - - error = kernel_mount(ma, flags); - - return (error); -} - static const char *ntfs_opts[] = { "from", "export", "uid", "gid", "mode", "caseins", "allnames", "kiconv", "cs_ntfs", "cs_local", NULL @@ -780,7 +750,6 @@ ntfs_bufstrategy(struct bufobj *bo, struct buf *bp static struct vfsops ntfs_vfsops = { .vfs_fhtovp = ntfs_fhtovp, .vfs_init = ntfs_init, - .vfs_cmount = ntfs_cmount, .vfs_mount = ntfs_mount, .vfs_root = ntfs_root, .vfs_statfs = ntfs_statfs, Index: sys/fs/cd9660/cd9660_vfsops.c =================================================================== --- sys/fs/cd9660/cd9660_vfsops.c (revision 203014) +++ sys/fs/cd9660/cd9660_vfsops.c (working copy) @@ -69,7 +69,6 @@ MALLOC_DEFINE(M_ISOFSNODE, "isofs_node", "ISOFS vn struct iconv_functions *cd9660_iconv = NULL; static vfs_mount_t cd9660_mount; -static vfs_cmount_t cd9660_cmount; static vfs_unmount_t cd9660_unmount; static vfs_root_t cd9660_root; static vfs_statfs_t cd9660_statfs; @@ -79,7 +78,6 @@ static vfs_fhtovp_t cd9660_fhtovp; static struct vfsops cd9660_vfsops = { .vfs_fhtovp = cd9660_fhtovp, .vfs_mount = cd9660_mount, - .vfs_cmount = cd9660_cmount, .vfs_root = cd9660_root, .vfs_statfs = cd9660_statfs, .vfs_unmount = cd9660_unmount, @@ -95,34 +93,6 @@ static int iso_mountfs(struct vnode *devvp, struct */ static int -cd9660_cmount(struct mntarg *ma, void *data, int flags) -{ - struct iso_args args; - int error; - - error = copyin(data, &args, sizeof args); - if (error) - return (error); - - ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); - ma = mount_arg(ma, "export", &args.export, sizeof args.export); - ma = mount_argsu(ma, "cs_disk", args.cs_disk, 64); - ma = mount_argsu(ma, "cs_local", args.cs_local, 64); - ma = mount_argf(ma, "ssector", "%u", args.ssector); - ma = mount_argb(ma, !(args.flags & ISOFSMNT_NORRIP), "norrip"); - ma = mount_argb(ma, args.flags & ISOFSMNT_GENS, "nogens"); - ma = mount_argb(ma, args.flags & ISOFSMNT_EXTATT, "noextatt"); - ma = mount_argb(ma, !(args.flags & ISOFSMNT_NOJOLIET), "nojoliet"); - ma = mount_argb(ma, - args.flags & ISOFSMNT_BROKENJOLIET, "nobrokenjoliet"); - ma = mount_argb(ma, args.flags & ISOFSMNT_KICONV, "nokiconv"); - - error = kernel_mount(ma, flags); - - return (error); -} - -static int cd9660_mount(struct mount *mp) { struct vnode *devvp; Index: sys/fs/nwfs/nwfs_vfsops.c =================================================================== --- sys/fs/nwfs/nwfs_vfsops.c (revision 203014) +++ sys/fs/nwfs/nwfs_vfsops.c (working copy) @@ -66,7 +66,6 @@ SYSCTL_INT(_vfs_nwfs, OID_AUTO, debuglevel, CTLFLA MODULE_DEPEND(nwfs, ncp, 1, 1, 1); MODULE_DEPEND(nwfs, libmchain, 1, 1, 1); -static vfs_cmount_t nwfs_cmount; static vfs_mount_t nwfs_mount; static vfs_quotactl_t nwfs_quotactl; static vfs_root_t nwfs_root; @@ -78,7 +77,6 @@ static vfs_uninit_t nwfs_uninit; static struct vfsops nwfs_vfsops = { .vfs_init = nwfs_init, .vfs_mount = nwfs_mount, - .vfs_cmount = nwfs_cmount, .vfs_quotactl = nwfs_quotactl, .vfs_root = nwfs_root, .vfs_statfs = nwfs_statfs, @@ -129,27 +127,6 @@ nwfs_initnls(struct nwmount *nmp) { return 0; } -static int nwfs_cmount(struct mntarg *ma, void *data, int flags) -{ - struct nwfs_args args; /* will hold data from mount request */ - int error; - - error = copyin(data, &args, sizeof(struct nwfs_args)); - if (error) - return (error); - - /* - * XXX: cheap cop-out here, args contains a structure I don't - * XXX: know how we should handle, and I don't see any immediate - * XXX: prospect of avoiding a mount_nwfs(8) binary anyway. - */ - ma = mount_arg(ma, "nwfs_args", &args, sizeof args); - - error = kernel_mount(ma, flags); - - return (error); -} - /* * mp - path - addr in user space of mount point (ie /usr or whatever) * data - addr in user space of mount params Index: sys/fs/fdescfs/fdesc_vfsops.c =================================================================== --- sys/fs/fdescfs/fdesc_vfsops.c (revision 203014) +++ sys/fs/fdescfs/fdesc_vfsops.c (working copy) @@ -54,22 +54,12 @@ static MALLOC_DEFINE(M_FDESCMNT, "fdesc_mount", "FDESC mount structure"); -static vfs_cmount_t fdesc_cmount; static vfs_mount_t fdesc_mount; static vfs_unmount_t fdesc_unmount; static vfs_statfs_t fdesc_statfs; static vfs_root_t fdesc_root; /* - * Compatibility shim for old mount(2) system call. - */ -int -fdesc_cmount(struct mntarg *ma, void *data, int flags) -{ - return kernel_mount(ma, flags); -} - -/* * Mount the per-process file descriptors (/dev/fd) */ static int @@ -226,7 +216,6 @@ fdesc_statfs(mp, sbp) } static struct vfsops fdesc_vfsops = { - .vfs_cmount = fdesc_cmount, .vfs_init = fdesc_init, .vfs_mount = fdesc_mount, .vfs_root = fdesc_root, Index: sys/fs/msdosfs/msdosfs_vfsops.c =================================================================== --- sys/fs/msdosfs/msdosfs_vfsops.c (revision 203014) +++ sys/fs/msdosfs/msdosfs_vfsops.c (working copy) @@ -194,39 +194,6 @@ update_mp(struct mount *mp, struct thread *td) return 0; } -static int -msdosfs_cmount(struct mntarg *ma, void *data, int flags) -{ - struct msdosfs_args args; - int error; - - if (data == NULL) - return (EINVAL); - error = copyin(data, &args, sizeof args); - if (error) - return (error); - - ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); - ma = mount_arg(ma, "export", &args.export, sizeof args.export); - ma = mount_argf(ma, "uid", "%d", args.uid); - ma = mount_argf(ma, "gid", "%d", args.gid); - ma = mount_argf(ma, "mask", "%d", args.mask); - ma = mount_argf(ma, "dirmask", "%d", args.dirmask); - - ma = mount_argb(ma, args.flags & MSDOSFSMNT_SHORTNAME, "noshortname"); - ma = mount_argb(ma, args.flags & MSDOSFSMNT_LONGNAME, "nolongname"); - ma = mount_argb(ma, !(args.flags & MSDOSFSMNT_NOWIN95), "nowin95"); - ma = mount_argb(ma, args.flags & MSDOSFSMNT_KICONV, "nokiconv"); - - ma = mount_argsu(ma, "cs_win", args.cs_win, MAXCSLEN); - ma = mount_argsu(ma, "cs_dos", args.cs_dos, MAXCSLEN); - ma = mount_argsu(ma, "cs_local", args.cs_local, MAXCSLEN); - - error = kernel_mount(ma, flags); - - return (error); -} - /* * mp - path - addr in user space of mount point (ie /usr or whatever) * data - addr in user space of mount params including the name of the block @@ -971,7 +938,6 @@ msdosfs_fhtovp(struct mount *mp, struct fid *fhp, static struct vfsops msdosfs_vfsops = { .vfs_fhtovp = msdosfs_fhtovp, .vfs_mount = msdosfs_mount, - .vfs_cmount = msdosfs_cmount, .vfs_root = msdosfs_root, .vfs_statfs = msdosfs_statfs, .vfs_sync = msdosfs_sync, Index: sys/sys/mount.h =================================================================== --- sys/sys/mount.h (revision 203014) +++ sys/sys/mount.h (working copy) @@ -556,7 +556,6 @@ struct nameidata; struct sysctl_req; struct mntarg; -typedef int vfs_cmount_t(struct mntarg *ma, void *data, int flags); typedef int vfs_unmount_t(struct mount *mp, int mntflags); typedef int vfs_root_t(struct mount *mp, int flags, struct vnode **vpp); typedef int vfs_quotactl_t(struct mount *mp, int cmds, uid_t uid, void *arg); @@ -580,7 +579,6 @@ typedef void vfs_susp_clean_t(struct mount *mp); struct vfsops { vfs_mount_t *vfs_mount; - vfs_cmount_t *vfs_cmount; vfs_unmount_t *vfs_unmount; vfs_root_t *vfs_root; vfs_quotactl_t *vfs_quotactl;