X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fexports.c;h=7e0decf0b4d12cb77b868aff7eb4f7b7a48f2f15;hp=5a8e7e9982fef7181b02f63e9e663387296f0e2a;hb=0bd51f4c931eb68c355140c721763be64213a3ca;hpb=13e118068de064b9bd69c629b74ccb11745c20c9

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 5a8e7e9..7e0decf 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -61,7 +61,7 @@ setexportent(char *fname, char *type)
 }
 
 struct exportent *
-getexportent(void)
+getexportent(int fromkernel)
 {
 	static struct exportent	ee;
 	char		exp[512];
@@ -74,6 +74,15 @@ getexportent(void)
 
 	freesquash();
 	ee.e_flags = EXPORT_DEFAULT_FLAGS;
+	/* some kernels assume the default is sync rather than
+	 * async.  More recent kernels always report one or other,
+	 * but this test makes sure we assume same as kernel
+	 * Ditto for wgather
+	 */
+	if (fromkernel) {
+		ee.e_flags &= ~NFSEXP_ASYNC;
+		ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
+	}
 	ee.e_maptype = CLE_MAP_IDENT;
 	ee.e_anonuid = -2;
 	ee.e_anongid = -2;
@@ -309,6 +318,10 @@ parseopts(char *cp, struct exportent *ep)
 			ep->e_flags |= NFSEXP_CROSSMNT;
 		else if (!strcmp(opt, "hide"))
 			ep->e_flags &= ~NFSEXP_CROSSMNT;
+		else if (!strcmp(opt, "crossmnt"))		/* old style */
+			ep->e_flags |= NFSEXP_CROSSMNT;
+		else if (!strcmp(opt, "nocrossmnt"))		/* old style */
+			ep->e_flags &= ~NFSEXP_CROSSMNT;
 		else if (!strcmp(opt, "wdelay"))
 			ep->e_flags |= NFSEXP_GATHERED_WRITES;
 		else if (!strcmp(opt, "no_wdelay"))