Fix nfs exports (for now). The real fix is to teach mountd about

nmount.

1 files changed, 4 insertions, 9 deletions

diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 7b9f4d5..02b9a2e 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -121,9 +121,8 @@ ffs_mount(struct mount *mp, struct thread *td)
 	int error, flags;
 	mode_t accessmode;
 	struct nameidata ndp;
-	struct export_args *export;
+	struct export_args export;
 	char *fspec;
-	int len;
 
 	if (vfs_filteropt(mp->mnt_optnew, ffs_opts))
 		return (EINVAL);
@@ -283,13 +282,9 @@ ffs_mount(struct mount *mp, struct thread *td)
 		/*
 		 * If not updating name, process export requests.
 		 */
-		if (fspec == NULL) {
-			error = vfs_getopt(mp->mnt_optnew,
-			    "export", (void **)&export, &len);
-			if (error || len != sizeof *export)
-				return (EINVAL);
-			return (vfs_export(mp, export));
-		}
+		error = vfs_copyopt(mp->mnt_optnew, "export", &export, sizeof export);
+		if (error == 0 && export.ex_flags != 0)
+			return (vfs_export(mp, &export));
 		/*
 		 * If this is a snapshot request, take the snapshot.
 		 */