summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/fsck_ext2fs/main.c8
-rw-r--r--sbin/fsck_ffs/main.c8
-rw-r--r--sbin/mount_ados/mount_ados.c10
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c10
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c10
-rw-r--r--sbin/mount_ffs/mount_ffs.c10
-rw-r--r--sbin/mount_lfs/mount_lfs.c10
-rw-r--r--sbin/mount_msdos/mount_msdos.c10
-rw-r--r--sbin/mountd/mountd.c24
-rw-r--r--sbin/newfs/newfs.c10
-rw-r--r--sys/adosfs/advfsops.c5
-rw-r--r--sys/compat/ultrix/ultrix_fs.c4
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c5
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c5
-rw-r--r--sys/sys/mount.h14
-rw-r--r--sys/ufs/ext2fs/ext2fs_vfsops.c5
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c5
-rw-r--r--sys/ufs/lfs/lfs_vfsops.c7
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c5
19 files changed, 87 insertions, 78 deletions
diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c
index cecfe2ff6b2..efefef00031 100644
--- a/sbin/fsck_ext2fs/main.c
+++ b/sbin/fsck_ext2fs/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.8 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: main.c,v 1.9 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $ */
/*
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#if 0
static char rcsid[] = "$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.8 2002/02/16 21:27:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.9 2002/04/23 18:54:12 espie Exp $";
#endif
#endif
#endif /* not lint */
@@ -309,8 +309,8 @@ checkfilesys(filesys, mntpt, auxdata, child)
if (flags & MNT_RDONLY) {
args.fspec = 0;
- args.export.ex_flags = 0;
- args.export.ex_root = 0;
+ args.export_info.ex_flags = 0;
+ args.export_info.ex_root = 0;
flags |= MNT_UPDATE | MNT_RELOAD;
ret = mount(MOUNT_EXT2FS, "/", flags, &args);
if (ret == 0)
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 01b6279742e..128027fa529 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.20 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: main.c,v 1.21 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.20 2002/02/16 21:27:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.21 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -338,8 +338,8 @@ checkfilesys(filesys, mntpt, auxdata, child)
if (flags & MNT_RDONLY) {
args.fspec = 0;
- args.export.ex_flags = 0;
- args.export.ex_root = 0;
+ args.export_info.ex_flags = 0;
+ args.export_info.ex_root = 0;
flags |= MNT_UPDATE | MNT_RELOAD;
ret = mount(MOUNT_FFS, "/", flags, &args);
if (ret == 0)
diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c
index 61ebe19cbf1..f1ac890824c 100644
--- a/sbin/mount_ados/mount_ados.c
+++ b/sbin/mount_ados/mount_ados.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_ados.c,v 1.8 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_ados.c,v 1.9 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_ados.c,v 1.5 1996/04/13 01:30:59 jtc Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.8 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.9 2002/04/23 18:54:12 espie Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
@@ -114,11 +114,11 @@ main(argc, argv)
}
args.fspec = dev;
- args.export.ex_root = -2; /* unchecked anyway on DOS fs */
+ args.export_info.ex_root = -2; /* unchecked anyway on DOS fs */
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
if (!set_gid || !set_uid || !set_mask) {
if (stat(dir, &sb) == -1)
err(1, "stat %s", dir);
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 4a35f1f5b74..aaabcc9ad0b 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_cd9660.c,v 1.13 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $ */
/*
@@ -49,7 +49,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_cd9660.c 8.4 (Berkeley) 3/27/94";
#else
-static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.13 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -116,15 +116,15 @@ main(argc, argv)
#define DEFAULT_ROOTUID -2
args.fspec = dev;
- args.export.ex_root = DEFAULT_ROOTUID;
+ args.export_info.ex_root = DEFAULT_ROOTUID;
#if 1
mntflags |= MNT_RDONLY;
#endif
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
args.flags = opts;
if (mount(MOUNT_CD9660, dir, mntflags, &args) < 0) {
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index a7bdf9cc990..14a6aee2945 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_ext2fs.c,v 1.8 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_ext2fs.c,v 1.9 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94";
#else
-static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.8 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.9 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -98,11 +98,11 @@ main(argc, argv)
fs_name = argv[1]; /* The mount point. */
#define DEFAULT_ROOTUID -2
- args.export.ex_root = DEFAULT_ROOTUID;
+ args.export_info.ex_root = DEFAULT_ROOTUID;
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
if (mount(MOUNT_EXT2FS, fs_name, mntflags, &args) < 0) {
switch (errno) {
diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c
index 29e2f343467..ce92eb72b53 100644
--- a/sbin/mount_ffs/mount_ffs.c
+++ b/sbin/mount_ffs/mount_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_ffs.c,v 1.12 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_ffs.c,v 1.13 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94";
#else
-static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.12 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.13 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -103,11 +103,11 @@ main(argc, argv)
fs_name = argv[1]; /* The mount point. */
#define DEFAULT_ROOTUID -2
- args.export.ex_root = DEFAULT_ROOTUID;
+ args.export_info.ex_root = DEFAULT_ROOTUID;
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
if (mount(MOUNT_FFS, fs_name, mntflags, &args) < 0) {
switch (errno) {
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
index eb1bec192c5..1b258c12f64 100644
--- a/sbin/mount_lfs/mount_lfs.c
+++ b/sbin/mount_lfs/mount_lfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_lfs.c,v 1.6 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_lfs.c,v 1.7 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_lfs.c,v 1.4 1996/04/13 05:35:44 cgd Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94";
#else
-static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.6 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.7 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -113,11 +113,11 @@ main(argc, argv)
fs_name = argv[1]; /* the mount point */
#define DEFAULT_ROOTUID -2
- args.export.ex_root = DEFAULT_ROOTUID;
+ args.export_info.ex_root = DEFAULT_ROOTUID;
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
if (mount(MOUNT_LFS, fs_name, mntflags, &args) == -1) {
switch (errno) {
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 5f642b02c7e..80c42abf239 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_msdos.c,v 1.13 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_msdos.c,v 1.14 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.13 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.14 2002/04/23 18:54:12 espie Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
@@ -128,11 +128,11 @@ main(argc, argv)
}
args.fspec = dev;
- args.export.ex_root = -2; /* unchecked anyway on DOS fs */
+ args.export_info.ex_root = -2; /* unchecked anyway on DOS fs */
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
if (!set_gid || !set_uid || !set_mask) {
if (stat(dir, &sb) == -1)
err(1, "stat %s", dir);
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 356d1db88aa..42a4ef92177 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mountd.c,v 1.44 2002/04/04 20:57:17 millert Exp $ */
+/* $OpenBSD: mountd.c,v 1.45 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */
/*
@@ -768,7 +768,7 @@ get_exportlist()
!strncmp(fsp->f_fstypename, MOUNT_CD9660, MFSNAMELEN)) {
bzero((char *)&targs, sizeof(targs));
targs.ua.fspec = NULL;
- targs.ua.export.ex_flags = MNT_DELEXPORT;
+ targs.ua.export_info.ex_flags = MNT_DELEXPORT;
if (mount(fsp->f_fstypename, fsp->f_mntonname,
fsp->f_flags | MNT_UPDATE, &targs) < 0)
syslog(LOG_ERR, "Can't delete exports for %s: %m",
@@ -1599,8 +1599,8 @@ do_mount(ep, grp, exflags, anoncrp, dirp, dirplen, fsb)
in_addr_t net;
args.ua.fspec = 0;
- args.ua.export.ex_flags = exflags;
- args.ua.export.ex_anon = *anoncrp;
+ args.ua.export_info.ex_flags = exflags;
+ args.ua.export_info.ex_anon = *anoncrp;
memset(&sin, 0, sizeof(sin));
memset(&imask, 0, sizeof(imask));
sin.sin_family = AF_INET;
@@ -1616,21 +1616,21 @@ do_mount(ep, grp, exflags, anoncrp, dirp, dirplen, fsb)
while (!done) {
switch (grp->gr_type) {
case GT_HOST:
- args.ua.export.ex_addr = (struct sockaddr *)&sin;
- args.ua.export.ex_masklen = 0;
+ args.ua.export_info.ex_addr = (struct sockaddr *)&sin;
+ args.ua.export_info.ex_masklen = 0;
if (!addrp) {
- args.ua.export.ex_addrlen = 0;
+ args.ua.export_info.ex_addrlen = 0;
break;
}
sin.sin_addr.s_addr = **addrp;
- args.ua.export.ex_addrlen = sizeof(sin);
+ args.ua.export_info.ex_addrlen = sizeof(sin);
break;
case GT_NET:
sin.sin_addr.s_addr = grp->gr_ptr.gt_net.nt_net;
- args.ua.export.ex_addr = (struct sockaddr *)&sin;
- args.ua.export.ex_addrlen = sizeof (sin);
- args.ua.export.ex_mask = (struct sockaddr *)&imask;
- args.ua.export.ex_masklen = sizeof (imask);
+ args.ua.export_info.ex_addr = (struct sockaddr *)&sin;
+ args.ua.export_info.ex_addrlen = sizeof (sin);
+ args.ua.export_info.ex_mask = (struct sockaddr *)&imask;
+ args.ua.export_info.ex_masklen = sizeof (imask);
if (grp->gr_ptr.gt_net.nt_mask) {
imask.sin_addr.s_addr = grp->gr_ptr.gt_net.nt_mask;
break;
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 0d50965a66f..4751e98786a 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs.c,v 1.32 2002/02/19 19:39:38 millert Exp $ */
+/* $OpenBSD: newfs.c,v 1.33 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94";
#else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.32 2002/02/19 19:39:38 millert Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.33 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -591,11 +591,11 @@ havelabel:
sprintf(buf, "mfs:%d", getpid());
args.fspec = buf;
- args.export.ex_root = -2;
+ args.export_info.ex_root = -2;
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
args.base = membase;
args.size = fssize * sectorsize;
if (mount(MOUNT_MFS, argv[1], mntflags, &args) < 0)
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index 1442490c5d8..56b0ee963cd 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: advfsops.c,v 1.23 2002/03/14 03:15:49 millert Exp $ */
+/* $OpenBSD: advfsops.c,v 1.24 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $ */
/*
@@ -99,7 +99,8 @@ adosfs_mount(mp, path, data, ndp, p)
if (mp->mnt_flag & MNT_UPDATE) {
amp = VFSTOADOSFS(mp);
if (args.fspec == 0)
- return (vfs_export(mp, &amp->export, &args.export));
+ return (vfs_export(mp, &amp->export,
+ &args.export_info));
}
/*
* Not an update, or updating the name: look up the name
diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c
index a088fedf7f0..eafa1f03136 100644
--- a/sys/compat/ultrix/ultrix_fs.c
+++ b/sys/compat/ultrix/ultrix_fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ultrix_fs.c,v 1.7 2002/03/14 03:16:03 millert Exp $ */
+/* $OpenBSD: ultrix_fs.c,v 1.8 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $ */
/*
@@ -376,7 +376,7 @@ ultrix_sys_mount(p, v, retval)
struct ufs_args ua;
ua.fspec = SCARG(uap, special);
- bzero(&ua.export, sizeof(ua.export));
+ bzero(&ua.export_info, sizeof(ua.export_info));
SCARG(&nuap, data) = usp;
if ((error = copyout(&ua, SCARG(&nuap, data),
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index ca478a1aefd..489a81db5b6 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd9660_vfsops.c,v 1.31 2002/03/14 03:16:09 millert Exp $ */
+/* $OpenBSD: cd9660_vfsops.c,v 1.32 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */
/*-
@@ -160,7 +160,8 @@ cd9660_mount(mp, path, data, ndp, p)
if (mp->mnt_flag & MNT_UPDATE) {
imp = VFSTOISOFS(mp);
if (args.fspec == 0)
- return (vfs_export(mp, &imp->im_export, &args.export));
+ return (vfs_export(mp, &imp->im_export,
+ &args.export_info));
}
/*
* Not an update, or updating the name: look up the name
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index d4dff563bb1..f62779fff87 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vfsops.c,v 1.29 2002/03/14 01:27:09 millert Exp $ */
+/* $OpenBSD: msdosfs_vfsops.c,v 1.30 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */
/*-
@@ -159,7 +159,8 @@ msdosfs_mount(mp, path, data, ndp, p)
/*
* Process export requests.
*/
- return (vfs_export(mp, &pmp->pm_export, &args.export));
+ return (vfs_export(mp, &pmp->pm_export,
+ &args.export_info));
}
}
/*
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index aa3a170b329..04eefb10a46 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.h,v 1.46 2002/03/15 01:20:04 millert Exp $ */
+/* $OpenBSD: mount.h,v 1.47 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */
/*
@@ -77,7 +77,7 @@ struct export_args {
*/
struct ufs_args {
char *fspec; /* block special device to mount */
- struct export_args export; /* network export information */
+ struct export_args export_info;/* network export information */
};
/*
@@ -85,7 +85,7 @@ struct ufs_args {
*/
struct mfs_args {
char *fspec; /* name to export for statfs */
- struct export_args export; /* if exported MFSes are supported */
+ struct export_args export_info;/* if exported MFSes are supported */
caddr_t base; /* base of file system in memory */
u_long size; /* size of file system */
};
@@ -95,7 +95,7 @@ struct mfs_args {
*/
struct iso_args {
char *fspec; /* block special device to mount */
- struct export_args export; /* network export info */
+ struct export_args export_info;/* network export info */
int flags; /* mounting flags, see below */
};
#define ISOFSMNT_NORRIP 0x00000001 /* disable Rock Ridge Ext.*/
@@ -208,7 +208,8 @@ struct nfs_args3 {
*/
struct msdosfs_args {
char *fspec; /* blocks special holding the fs to mount */
- struct export_args export; /* network export information */
+ struct export_args export_info;
+ /* network export information */
uid_t uid; /* uid that owns msdosfs files */
gid_t gid; /* gid that owns msdosfs files */
mode_t mask; /* mask to be applied for msdosfs perms */
@@ -228,7 +229,8 @@ struct msdosfs_args {
*/
struct adosfs_args {
char *fspec; /* blocks special holding the fs to mount */
- struct export_args export; /* network export information */
+ struct export_args export_info;
+ /* network export information */
uid_t uid; /* uid that owns adosfs files */
gid_t gid; /* gid that owns adosfs files */
mode_t mask; /* mask to be applied for adosfs perms */
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 41a1db6eab3..be42b2defbe 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vfsops.c,v 1.22 2002/03/14 01:27:14 millert Exp $ */
+/* $OpenBSD: ext2fs_vfsops.c,v 1.23 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */
/*
@@ -245,7 +245,8 @@ ext2fs_mount(mp, path, data, ndp, p)
/*
* Process export requests.
*/
- return (vfs_export(mp, &ump->um_export, &args.export));
+ return (vfs_export(mp, &ump->um_export,
+ &args.export_info));
}
}
/*
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 8cc3a748539..e420dca2f6a 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vfsops.c,v 1.52 2002/03/14 01:27:14 millert Exp $ */
+/* $OpenBSD: ffs_vfsops.c,v 1.53 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */
/*
@@ -309,7 +309,8 @@ ffs_mount(mp, path, data, ndp, p)
/*
* Process export requests.
*/
- error = vfs_export(mp, &ump->um_export, &args.export);
+ error = vfs_export(mp, &ump->um_export,
+ &args.export_info);
if (error)
goto error_1;
else
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 17193210ce6..629bc5023e4 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lfs_vfsops.c,v 1.15 2002/03/14 01:27:15 millert Exp $ */
+/* $OpenBSD: lfs_vfsops.c,v 1.16 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: lfs_vfsops.c,v 1.11 1996/03/25 12:53:35 pk Exp $ */
/*
@@ -114,7 +114,7 @@ lfs_mount(mp, path, data, ndp, p)
return (error);
/* Until LFS can do NFS right. XXX */
- if (args.export.ex_flags & MNT_EXPORTED)
+ if (args.export_info.ex_flags & MNT_EXPORTED)
return (EINVAL);
/*
@@ -144,7 +144,8 @@ lfs_mount(mp, path, data, ndp, p)
/*
* Process export requests.
*/
- return (vfs_export(mp, &ump->um_export, &args.export));
+ return (vfs_export(mp, &ump->um_export,
+ &args.export_info));
}
}
/*
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 58a67fc60cc..b7a892d57cf 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfs_vfsops.c,v 1.19 2002/03/14 01:27:15 millert Exp $ */
+/* $OpenBSD: mfs_vfsops.c,v 1.20 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */
/*
@@ -205,7 +205,8 @@ mfs_mount(mp, path, data, ndp, p)
fs->fs_ronly = 0;
#ifdef EXPORTMFS
if (args.fspec == 0)
- return (vfs_export(mp, &ump->um_export, &args.export));
+ return (vfs_export(mp, &ump->um_export,
+ &args.export_info));
#endif
return (0);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 19:20:11 +0000